Fixes needed for running tests against puppet's master branch

Specifically this commit

 - Adds specific checks for puppet 3 when loading storeconfig code
   storeconfig does not work against current master and will be removed
   as part of Puppet 4.0.0. We want to maintain backward compatibility,
   so the code supports both

 - Removes references to Puppet[:trusted_node_data] when on Puppet
   4 (essentially assuming it is always true on 4). Like above we will
   look for it when on Puppet 3.y.z and ignore it (assuming true) when
   on Puppet 4.y.z
Merge pull request #1163 from senior/maint/stable/puppet-4-compiler-change

Fixes needed for running tests against puppet's master branch
(maint) Switch to new el5 image for acceptance tests

The old image had CentosPlus enabled, which pulled in an odd postfix version
that pulled in a conflicting 'postgresql' package. This new image no longer
uses the CentosPlus repository, since we weren't using it before this anyway
it probably won't matter.

Signed-off-by: Ken Barber <ken@bob.sh>
Merge pull request #1171 from kbarber/maint/stable/fix-postfix-postgresql-dep-acceptance-failures

(maint) Switch to new el5 image for acceptance tests
Merge branch 'stable'

* stable:
  (maint) Switch to new el5 image for acceptance tests
  Fixes needed for running tests against puppet's master branch

Conflicts:
	config/image_templates/ec2.yaml
	puppet/lib/puppet/indirector/facts/puppetdb.rb
	puppet/lib/puppet/util/puppetdb.rb