BISERVER-10435: Fixed tests broken by yesterdays checkin.
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
BISERVER-10435:  Ensured all applicable classes are annotated.
Merge branch '5.1-sandbox' of https://github.com/pentaho/data-access into 5.1-sandbox

Conflicts:
	src/org/pentaho/platform/dataaccess/catalog/impl/DatasourceCatalog.java
	src/org/pentaho/platform/dataaccess/catalog/impl/DatasourceChild.java
BISERVER-10378 - Fix for serialization
Merge pull request #337 from pminutillo/5.1-sandbox

BISERVER-10378 - Fix for getDatasourcesByType endpoint
Merge branch '5.1-sandbox' of https://github.com/pentaho/data-access into 5.1-sandbox