Merge branch '2.4.x'

* 2.4.x:
  (#13439) Fix test failures with Puppet 2.6.x
  (#13439) refactor spec helper for compatibility with both puppet 2.7 and master
Merge branch '2.4.x'

* 2.4.x:
  (#13439) Fix MRI 1.9 issue with spec_helper
(#13693) moving logic from local spec_helper to puppetlabs_spec_helper

This should simplify future compatibility between various versions
of stdlib and various versions of puppet core.
Merge pull request #61 from cprice-puppet/ticket/master/13693-use-puppetlabs-spec-helper

(#13693) moving logic from local spec_helper to puppetlabs_spec_helper
Merge branch '2.3.x'

* 2.3.x:
  Revert "Merge remote-tracking branch 'eshamow/tickets/bug/13595_restrict_initialize_everything_for_tests' into 2.2.x"
  (#13595) initialize_everything_for_tests couples modules Puppet ver
Merge branch '2.3.x'

* 2.3.x:
  Update CHANGELOG for 2.3.2 release
  Make file_line default to ensure => present
  Memoize file_line spec instance variables
  Fix spec tests using the new spec_helper
Merge branch '2.3.x'

* 2.3.x:
  Fix spec tests using the new spec_helper