(PUP-2484) Revert to merging Modulefile and metadata.json in PMT build.

Previously, if you tried to build a module that contained both a
Modulefile and a metadata.json file, the behavior of the build action
was to ignore the Modulefile and simply use the metadata.json as is.

This represented a change in behavior from earlier, where we would merge
the contents of those two files. While this is in keeping with the
direction the tool is moving, there is a small subset of users who would
be negatively impacted by the sudden change in behavior. For this reason
we are reverting to the original behavior and passing it through a
proper deprecation cycle.
(PUP-2484) Ensure that Modulefile dependencies are properly serialized.

Prior to this change, dependencies expressed in the Modulefile were
incorrectly being coerced to Strings before being serialized to JSON; a
change which seems to have been accidentally precipitated by our
migration away from PSON.

This change restores the intended behavior, serializing the dependencies
to JSON in the same way they used to.
(maint) Whitespace fixup in ext/debian/puppetmaster-passenger.postinst
(PUP-2395) Add apache2 dependency to puppetmaster-passenger

The postinst of the puppetmaster-passenger depends on the a2*
binaries to configure the package. This dependency moved from the
apache2-common package into the main apache2 package, so this commit
adds apache2 as a dependency of the puppetmaster-passenger package.
(PUP-2395) Update puppetmaster-passenger for httpd 2.4

In httpd 2.4 some of the conventions around a2ensite changed which broke
the postinst and postrm scripts. This commit brings in several changes from the
debian puppet packaging that have addressed this problem. An
apache2_puppetmaster_sitename function is used to determine the correct
sitename to use in sites-available. Thanks to Stig Sandbeck Mathisen for
the work in the debian puppet packaging.
(PUP-2395) Refactor puppetmaster-postinst sed calls

This commit brings over a change from the debian puppet packaging to
move all of the sed calls in to one sed invocation and to use a tempfile
instead of operating directly on the live apache vhost file.
(PUP-2395) Update puppetmaster-passenger postinst for passenger 4

Passenger 4 deprecated and removed several vhost directives, which would
break installations of the package on platforms with passenger 4. This
commit adds a condional sed call to delete those directives if the
passenger version is 4 or greater.
Merge pull request #2619 from pvande/bug/stable/pup2484_revert_pmt_build_with_both_metadata_sources

(PUP-2484) Revert to merging Modulefile and metadata.json in PMT build.
Merge pull request #2622 from haus/ticket/stable/pup_2395_fixup_passenger_packaging

(PUP-2395) Fix puppetmaster-passenger for apache httpd 2.4
(maint) Include 'f' prefix for fedora paths in the builds repo

Recent changes to acceptance install_utils fetch all repository data
to the coordinator node and then push that data to the test nodes rather
than expecting the test nodes to be able to reach our internal builds
server.  Two paths being used to fetch repo data were missing the
necessiry of including a 'f' in the version segment of the path when
fetching fedora repo data. This patch fixes this.