Coadmin

Coordinator Admin Server and Client Side related changes. 
Fix this merge conflict