[BISERVER-6790] Jersey client code doesn't seem to communicate character encoding
Fix to a bunch of JUnit failures in UserRoleMapperTest. Also made some changes to the way we parse the datasource parameters when they are customized by a user.
Small cleanup of imports.
[BISERVER-8994] Localize File/Folder Context Actions
[BISERVER-8847] Handle Delete Folder Context Action
Merge pull request #482 from bytekast/BISERVER-8847

[BISERVER-8994][BISERVER-8847] i18n and Delete Folder Action
Merge branch 'master' of https://github.com/pentaho/pentaho-platform into impala
Merge pull request #473 from lucboudreau/impala

Impala Spike: Small fixes to the datasource importer so that it can support non JNDI connections. Plus some fixes to test failures in UserRoleMapperTest.
Merge pull request #469 from webdetails/BISERVER-6790

[BISERVER-6790] Jersey client code doesn't seem to communicate character encoding
BISERVER-9036 Only show blockout heading for non-admins when there are blockouts