BISERVER-10435: Added rest annotation to DatasourceCatalog and jaxb annotations to serialized classes.
Merge branch '5.1-sandbox' of https://github.com/pentaho/data-access into 5.1-sandbox

Conflicts:
	src/org/pentaho/platform/dataaccess/catalog/impl/DatasourceType.java
	src/org/pentaho/platform/dataaccess/datasource/provider/AnalysisDatasourceProvider.java
	src/org/pentaho/platform/dataaccess/datasource/provider/AnalysisDatasourceType.java
	src/org/pentaho/platform/dataaccess/datasource/provider/JDBCDatasourceProvider.java
	src/org/pentaho/platform/dataaccess/datasource/provider/JDBCDatasourceType.java
	src/org/pentaho/platform/dataaccess/datasource/provider/MetadataDatasourceType.java
Merge pull request #313 from wseyler/5.1-sandbox

BISERVER-10435: Added Jersey tags to DatasourceCatalog.  Added JAXB annotations to referenced classes.  Applied formatting