BISERVER-10378 - Fixes for unit tests
Merge pull request #328 from pminutillo/5.1-sandbox

BISERVER-10378 - Fixes for unit tests
Merge pull request #329 from wseyler/5.1-sandbox

BISERVER-10435: Serialization changes and annotation changes
BISERVER-10378 - Adding documentaton to the REST endpoint.
Merge pull request #330 from rmansoor/5.1-sandbox

BISERVER-10378 - Adding documentaton to the REST endpoint.
Merge pull request #331 from wseyler/5.1-sandbox

BISERVER-10435: Fixed issue with IDatasourceChild that was breaking enun...
BISERVER-10378 - Fixing compile error in unit test
Merge pull request #333 from rmansoor/5.1-sandbox

BISERVER-10378 - Fixing compile error in unit test
Merge branch '5.1-sandbox' of https://github.com/pentaho/data-access into 5.1-sandbox

Conflicts:
	test-src/org/pentaho/platform/dataaccess/catalog/impl/DatasourceProviderTest.java