Impala Spike: Small fixes to the datasource importer so that it can support non JNDI connections. Plus some fixes to test failures in UserRolaMapperTest.