Bug Fixes

When features autoscaler and migrate-1.3-without-consul are both
enabled, the removal code tries to update the eventgenerator and
metricscollector properties in the jobs section in the wrong
instance_groups, which results in the following error message:
```
Error: Cannot tell what release template 'eventgenerator' (instance group 'as-collector') is supposed to use, please explicitly specify one
```
This fix swaps them, placing them in the correct hierarchy.
Again with the migrate-1.3-without-consul feature, if using default
blobstore or database, the consul components were not being removed. This
is now fixed.
Fix edge case for deploying CF to Azure with HAProxy in the mix

Core Components

This is the list of core components used in this release. No core components were updated, added or removed since last release.

This is the list of buildpacks provided with this release. No buildpacks were updated, added or removed since last release.