Merge "Update the packer templates in releng/builder"