fixing install instructions to match pulp 2.4
Automatic commit of package [pulp-puppet] release [2.4.3-0.1.beta].
Merge branch '2.4-dev' into 2.5-testing

Conflicts:
	pulp-puppet.spec
	rel-eng/packages/pulp-puppet
Merge pull request #141 from pulp/mhrivnak-install-doc-fix

fixing install instructions to match pulp 2.4
Merge commit '1ba25384014516e2a2a125ef79d80cba01ffe7a5' into 2.5-dev
Merge commit '1ba25384014516e2a2a125ef79d80cba01ffe7a5' into 2.5-testing
Merge commit '1ba25384014516e2a2a125ef79d80cba01ffe7a5'
1153072 - do not delete /var/www/pulp_puppet on upgrade

Previously, the upgrade script would attempt to delete `/var/www/pulp_puppet`
as part of the upgrade procedure. This does not work since the upgrade runs as
apache user and not root.

Instead, move everything under `/var/www/pulp_puppet` to the correct location.
The directory itself is left for the user to clean up later as a manual step
since it requires root.
Merge branch '2.4-testing' into 2.4-release
Set the version to 2.4.3-1.
Automatic commit of package [pulp-puppet] release [2.4.3-1].
Merge branch '2.4-dev' into 2.5-testing

Conflicts:
	pulp-puppet.spec
	rel-eng/packages/pulp-puppet
Merge branch '2.5-testing' into 2.5-dev
Merge branch '2.5-dev'
Merge pull request #145 from beav/puppet-migration-fix

1153072 - do not delete /var/www/pulp_puppet on upgrade
pulp-dev.py installs the packages.
Merge branch 'dev_install'