Add support for client to wait server if server is not started.

Change-Id: I0000000000000000000000000000000000000003
Signed-off-by: Silencieux Le <silencieux.le@gmail.com>