fixes #7273 - sync puppet and rpm content together

previously there was a task spawned to sync rpm content to the capsule
when puppet content sync to the capsule was added, it was not added in
this 2nd task.  This commit moves puppet syncing to that 2nd, spanwed task.