TEIID-3176 ensuring that we don't overflow on the short conversion
Conflicts:
	client/src/main/java/org/teiid/jdbc/DatabaseMetaDataImpl.java