It looks like wait condition feature works nice
but there are some issues with that on several deployments.
Added option heat_enable_wait_condition to allow disabling of that.
Closes-bug: 1516784
Change-Id: I082ce0bb4ab8c3c939dcafc2bc821e38c5d760a7
(cherry picked from commit 7fbe557fc4)