Change waitFor to use Condition rather than Matcher

As part of the move to assertj, change the condition part of waitFor
to be an assertj Condition.
It seems Matcher is easier to use in this occasion. Do we have to abandon hamcrest entirely?