BISERVER-10435:  Ensured all applicable classes are annotated.
BISERVER-10435: Change Jersey methods to serialize using dto type classes.  Added Enunciate Doc
BISERVER-10435: Change Jersey methods to serialize using dto type classes.  Added Enunciate Doc
BISERVER-10437 - Updates to jmeter for api changes, organization
Merge pull request #326 from pminutillo/5.1-sandbox

BISERVER-10437 - Updates to jmeter for api changes, organization
BISERVER-10378 - Fixes for serialization in datasource catalog service
Merge pull request #327 from pminutillo/5.1-sandbox

BISERVER-10378 - Fixes for serialization in datasource catalog service
BISERVER-10378 - Fixes for unit tests
Merge pull request #328 from pminutillo/5.1-sandbox

BISERVER-10378 - Fixes for unit tests
Merge branch '5.1-sandbox' of https://github.com/pentaho/data-access into 5.1-sandbox

Conflicts:
	src/org/pentaho/platform/dataaccess/catalog/impl/Datasource.java
	src/org/pentaho/platform/dataaccess/catalog/impl/DatasourceCatalog.java
	src/org/pentaho/platform/dataaccess/catalog/impl/dto/DatasourceListDto.java
BISERVER-10435: Change Jersey methods to serialize using dto object for datsourceType list.
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.
BISERVER-10435: Fixed issue with IDatasourceChild that was breaking enunciate.
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