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.
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.