Merge "Pull in common-variables.sh PATH fix"