TEIID-2471 correcting metadatastore merging logic