[BISERVER-10816] Adds a condition to check if a connection must be exposed by XMLA or not.
Merge branch 'master' of https://github.com/pentaho/pentaho-platform
Merge pull request #1122 from lucboudreau/master

[BISERVER-10816] Adds a check to verify if a catalog must be exposed through XMLA or not.
MONDRIAN-1850 - changing how we load olap4j connections at startup.  Now able to use a properties file instead of XML to define the connection properties
[BISERVER-10748] Eliminate overloaded methods in IUnifiedRepositoryWebService so JAX-WS  works in pdi
Merge pull request #1125 from tkafalas/feature

[BISERVER-10748] Eliminate overloaded methods in IUnifiedRepositoryWebSe...
[BISERVER-10748] Missed class for method rename
Merge pull request #1126 from tkafalas/feature

[BISERVER-10748] Missed class for method rename
MONDRIAN-1846 - getting Mondrian OSGI bundle and it's dependencies into the EE build.
Merge pull request #1124 from kurtwalker/MONDRIAN-1850

MONDRIAN-1850 - changing how we load olap4j connections at startup.  Now...
Merge pull request #1127 from kurtwalker/MONDRIAN-1846

MONDRIAN-1846 - getting Mondrian OSGI bundle and it's dependencies into ...
[BISERVER-10748] Increase leniency of RepositoryRequest with respect to missing setter calls and/or empty strings.
Merge pull request #1128 from tkafalas/feature

[BISERVER-10748] Increase leniency of RepositoryRequest with respect to ...
[BISERVER-10816] Reverts the previous commit. Will fix this some other way.
Merge branch 'master' of https://github.com/pentaho/pentaho-platform
Merge pull request #1129 from lucboudreau/master

[BISERVER-10816] Revert of a previous commit.
[MONDRIAN-1844] Adds a public call to set the helper manually for testing.
Merge pull request #1130 from lucboudreau/master

[MONDRIAN-1844] Adds a public call to set the helper manually for testin...
[MONDRIAN-1844] Adds a public call to set the helper manually for testing.
Merge branch 'master' of https://github.com/pentaho/pentaho-platform