Merge pull request #115 from jdhok/develop2

Get all queries to include from persistent store as well
Fix build failures due to default hsql db config