Merge "Have vpnaas job definition inherit irrelevant files"