Merge "Remove local packer vars"