Add value for 'sed -i' parameter

Some versions of sed (MacOS and maybe BSD) show error if value for '-i'
parameter is missed. Without this change we can not run
'make version-yaml' on these OSes.

Change-Id: Ib81befbe302c9cb25c4bf67e45ae5dd90d58009a
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"
Bump master branch to 6.0

Change-Id: Ic1156d9dc5ca2ee86d1b4e2de953cc46748b9dfd
Merge "Add value for 'sed -i' parameter"
Revert "Add value for 'sed -i' parameter"

This reverts commit 493caa0c3fd47c612e58ef3d9a6f8fd5059516c0.

Change-Id: Icca919c2130e97936165882f9d7067d615fbeff6
Merge "Revert "Add value for 'sed -i' parameter""