Mode 2142 -  Fixed the changing of namespace prefixes if the URI is in use by a node type.

Should be merged after https://github.com/ModeShape/modeshape/pull/1040.