Make diego edge services work in collocated mode.

   + After respawn, sleep to give service dependencies time to come up

   + Merge consul client and consul server into single service, and restart it
     for collocated installation.

[#80789878]

Signed-off-by: David Julia <djulia@pivotal.io>