Merge pull request #132 from krivera-pentaho/dev

Merging pull request
Fixed layout of pooling options.
Merge pull request #133 from wseyler/dev

Fixed layout of pooling options.
BISERVER-8144 - moving composite key creation for tenant to the jcr
code
Merge pull request #134 from rmansoor/master

 	BISERVER-8144 - moving composite key creation for tenant to the jcr
BISERVER-8285 - removed the local host access
Merge pull request #135 from rmansoor/master

BISERVER-8285 - removed the local host access
Added the id of teh metadata connection as the name of the DatasourceInfo.