Merge pull request #63 from rmansoor/master

 BISERVER-8345 - Fixed NPE while generating inmemory datasource
BISERVER-8345 - Fixed some unit test failures