Improved OscAddressNode.merge() algorithm.

Tree-merges now handle name conflicts correctly, even when there are
pre-existing server-less address nodes.