Deploy WSGI apps at the same step (3)

So we avoid useless apache restart and save time during the deployment.

Note: the backport is not 100% clean as Heat API was not deployed in
WSGI during Ocata cycle, so now, it's only for Aodh.

Related-Bug: #1664418
Depends-On: Ibc184a50cf16b7048e0f7249f8894d8661bb76fe
Change-Id: Ie00b717a6741e215e59d219710154f0d2ce6b39e
(cherry picked from commit 2272bcabba)

manifests/profile/base/aodh/api.pp

@@ -35,7 +35,7 @@ class tripleo::profile::base::aodh::api (
 
   include ::tripleo::profile::base::aodh
 
-  if $step >= 4 {
+  if $step >= 3 {
     include ::aodh::api
     include ::aodh::wsgi::apache