TEIID-3165 updating property handling
Conflicts:
	client/src/main/java/org/teiid/jdbc/TeiidDataSource.java
Merge branch '8.7.x' of https://github.com/teiid/teiid into 8.7.x