Name changes, server manager tags and status implementation additions

Change-Id: I8e8ece020b122a71583fe478ced230550eab25bb
Merge "Name changes, server manager tags and status implementation additions" into R1.10