MODULES-957: Add more Apache 2.4 conditional blocks to configuration templates

[pcfens]

Adds conditional blocks that check for Apache 2.4 in templates referenced in MODULES-957 (that didn't already have them) as well as pagespeed.

[underscorgan]

This caused some acceptance test failures, on both apache 2.2 and apache 2.4:

  2) apache::mod::pagespeed class default pagespeed config succeeds in puppeting pagespeed
     Failure/Error: apply_manifest(pp, :catch_failures => true)
     Beaker::Host::CommandFailure:
       Host 'centos-64-x64' exited with 6 running:
        env PATH="/usr/bin:/opt/puppet-git-repos/hiera/bin:${PATH}" RUBYLIB="/opt/puppet-git-repos/hiera/lib:/opt/puppet-git-repos/hiera-puppet/lib:${RUBYLIB}" puppet apply  --verbose --detailed-exitcodes /tmp/apply_manifest.pp.F67uVO
       Last 10 lines of output were:
        allow requires at least two arguments, 'from' followed by hostnames or IP-address wildcards
        [FAILED]
        Error: /Stage[main]/Apache::Service/Service[httpd]: Could not start Service[httpd]: Execution of '/sbin/service httpd start' returned 1: Starting httpd: Syntax error on line 49 of /etc/httpd/conf.d/pagespeed.conf:
        allow requires at least two arguments, 'from' followed by hostnames or IP-address wildcards
        [FAILED]
        Wrapped exception:
        Execution of '/sbin/service httpd start' returned 1: Starting httpd: Syntax error on line 49 of /etc/httpd/conf.d/pagespeed.conf:
        allow requires at least two arguments, 'from' followed by hostnames or IP-address wildcards
        [FAILED]
        Notice: Finished catalog run in 19.48 seconds
     # ./spec/acceptance/mod_pagespeed_spec.rb:62:in `block (3 levels) in <top (required)>'

  3) apache::mod::pagespeed class default pagespeed config should answer to pagespeed.example.com and include <head/> and be stripped of comments by mod_pagespeed
     Failure/Error: shell("/usr/bin/curl pagespeed.example.com:80") do |r|
     Beaker::Host::CommandFailure:
       Host 'centos-64-x64' exited with 7 running:
         /usr/bin/curl pagespeed.example.com:80  
       Last 10 lines of output were:

        curl: (7) couldn't connect to host
     # ./spec/acceptance/mod_pagespeed_spec.rb:78:in `block (3 levels) in <top (required)>'

  4) apache::mod::pagespeed class default pagespeed config Service "httpd" should be running
     Failure/Error: it { should be_running }
       expected Service "httpd" to be running
     # ./spec/acceptance/mod_pagespeed_spec.rb:67:in `block (4 levels) in <top (required)>'

[pcfens]

Thanks for the heads up - vagrant beaker testing is acting up locally for me.

Latest push should fix it.

[underscorgan]

Ok, that looks good. Waiting on TravisCI then this can be merged!