Merge pull request #326 from pminutillo/5.1-sandbox

BISERVER-10437 - Updates to jmeter for api changes, organization
Merge pull request #327 from pminutillo/5.1-sandbox

BISERVER-10378 - Fixes for serialization in datasource catalog service
BISERVER-10378 - Fixes for unit tests