HUE-1817 [beeswax] Add watch_wait template to have at least the tests running
Merge remote-tracking branch 'upstream/master' into testing-abe