Merge "Only a test admin can be unmarked as a COPE admin" into tm-dev