add master->server admin auth

Change-Id: Id4aa307064992c27d9ce5b0ed3afda0551afd11c
Merge "add master->server admin auth" into 0.6.x