update registerAdmin to map {serverId:adminModule}

Change-Id: I6d5390953ffb5ff43f35f2f7b0360bf01cf64473
Merge "update registerAdmin to map {serverId:adminModule}" into 0.6.x