Two steps upgrade (resilient to ansible upgrade)

Our CI test for the upgrade shown that if ansible
package is updated during the rsync on the puppetmaster
and the file layout of ansible change then ansible
will fail to perform the upgrade.

This patch handles the upgrade in two step to avoid
failure if ansible package change.

This patch fixes the puppetmaster httpd conf as passenger
version has changed.

Change-Id: I1594292f9f716563398fa3922385d8736667af0c