Return more precise error message in __removeReplica()
v6r12
Conflicts resolved with rel-v6r12