(NC-140) Actually fix the integration tests I screwed up.

The problem was partly me, and partly the old copy of the beaker with_puppet_running_on we had in our helper.rb that would empty the master options hash we passed to it (ewwwww).