This reverts commit 424f77a45fc9b5a4610677ec08696572f10e584c as a recent
change provides similar functionality.

Add some @since annotations as this code is widely reused and it's
important enough to annotate with version info to ease consumer's task.

Renamed incorrectly named method waitAndAssertCondition.

Change-Id: Ib7353eca80e7dabdff536912562b7284bddf6859
Signed-off-by: Mickael Istria <mistria@redhat.com>
Signed-off-by: Jens Lidestrom <jens@lidestrom.se>