Moved some of the puppet setup stuff in system tests to rspec-system-puppet

Signed-off-by: Ken Barber <ken@bob.sh>
Merge branch 'rspec-system-puppet'

* rspec-system-puppet:
  Moved some of the puppet setup stuff in system tests to rspec-system-puppet