Backport fixes for swift and crm

* Fix for broken swift deploy order
* Fix for 'apply diff failed' situation
* Fix missing stop for native heat service in HA mode

Change-Id: I059d7bc48d073f37eca449b10bb9e66b24123c6b
Closes-Bug: 1365951
Related-Bug: 1364026
Related-Bug: 1283062
Merge "Backport fixes for swift and crm"