Changed update wait to wait for any state within a given duration.
Implemented a waiting which reports frequently that we are still waiting
for an arbitrary order change.