TEIID-2650: Adding runtime-version and session-count as metrics, the metrics also only be visible at ser not host-controller
Merge pull request #109 from rareddy/TEIID-2650

TEIID-2650: Adding runtime-version and session-count as metrics, the met...
TEIID-2656: adding unit tests
TEIID-2656: The designer based VDBs does not set the reference table
name on the ForeignKey, they only set the Primary Key, thus the OData
metadata call was failing to resolve the Foreign keys and throwing up an
exception. Fixed such that in obsence of Reference table name, if PK is
present the value will be derived from it, also pulled Steve's commit to
fix NPE

Conflicts:

	odata/src/test/java/org/teiid/odata/TestODataIntegration.java
TEIID-2660 fix for procedure issues with odata
TEIID-2660 correcting unit test
TEIID-2633 addressing another set of potentially unnecessary criteria
created by RuleCopyCriteria
Merge branch '8.5.x' of https://github.com/teiid/teiid
TEIID-2662 fixing generated sql for internal fbi handling
Merge branch '8.5.x' of https://github.com/teiid/teiid