Issue/master/with puppet running on

This is predominately a set of changes to with_puppet_running_on to get the foss portions of that code working for our puppet acceptance tests.  I added some specs for this as well.

There are some additional updates for a few small issues I found as I was running acceptance tests against packages and working on installing packages on Solaris and Windows for vcloud templates.