Merge remote-tracking branch 'origin/vladi-fix-usb-mysql-password' in…

…to develop

Merge pull request SUSE#824 from hpcloud/HCF-1224-wait-for-both-insta…

…nces

HCF-1224 Wait for both app instances to be running

Merge pull request SUSE#812 from hpcloud/HCF-1207-tcp-cleanup

[HCF-1207] Run cleanup of domain used for TCP routing, to keep within limits

Merge pull request SUSE#776 from hpcloud/mysqlprv

[HCFRO-439] - Create migration from Consul to MySql

Merge pull request SUSE#803 from hpcloud/HCF-1195-array-parameters

HCF-1195 Allow customizing blobstore access rules

Merge pull request SUSE#800 from hpcloud/HCF-1179-diego-cell

HCF-1179 diego cell

Merge develop

Merge remote-tracking branch 'origin/HCF-1088-show-current-droplet'

Merge pull request SUSE#757 from hpcloud/hcf-1117-no-peers-info

[HCF-1117] Don't rely on peers.info for consul recovery

Merge pull request SUSE#755 from hpcloud/bump-hcf-version

Update VERSION