ServerPredicates to make waiting easier.
Merge remote-tracking branch 'upstream/master'

Conflicts:
	apis/openstack-nova/pom.xml