Maint/stable/ec2 centos6 acceptance fixes

Two acceptance test fixes for tests which were failing in Beaker's ec2 smoketests for Puppet.