Merge changes from topic 'packer-revert-centos'