Merge pull request #554 from e-cuellar/5.2

[PMD-987] Fixed metadata import and broken unit test
[BACKLOG-290] Hardening of REST endpoints and jmeter tests

Conflicts:
	src/org/pentaho/platform/dataaccess/datasource/api/resources/AnalysisResource.java