Merge "Update user variables to match common-packer"