Add back Heat conditions in upgrade workflow
Add back Heat conditions in upgrade workflow

By adding back the conditions we avoid the deployment of unneded
software configs on nodes where we don't have any upgrade task to
run, speeding up the upgrade process.

Related-Bug: #1679486
Related-Bug: #1678101
Change-Id: I5c8b0c4abfc0607f42fd3f2da9f5ef2702b1bbe1

openstack/tripleo-heat-templates,openstack/tripleo-heat-templates,dprince/tripleo-heat-templates,dprince/tripleo-heat-templates