Fix yaml format and package-install spec
Merge branch 'puppet-e2e-test'