Adjust CLI wait methods to support "until"

Refs grnet/kamaki#46
Use "--while" and "--until" in "server wait"

Refs grnet/kamaki#46

To new arguments  are mutually exclussive.

The argument "--status STATUS" is kept for backwards compatibility
and it will be removed in a future version.