Merge "Use generic vars file for ubuntu"

This commit is contained in:
Zuul 2018-07-31 16:28:57 +00:00 committed by Gerrit Code Review
commit 07e7aac7ce