TEIID-2781 refining composite key updates
Conflicts:

	odata/src/main/java/org/teiid/odata/ODataPlugin.java
	odata/src/main/resources/org/teiid/odata/i18n.properties
	odata/src/test/java/org/teiid/odata/TestODataIntegration.java
	test-integration/common/src/test/java/org/teiid/systemmodel/TestAsynch.java