Merge pull request #4617 from jlsherrill/7273
fixes #7273 - capsule sync puppet and rpm content together
Merge pull request #4617 from jlsherrill/7273
fixes #7273 - capsule sync puppet and rpm content together