Fixed a bug in filtering exclude and include params
Using h2 database instead of hsqldb
reolved merge conflicts with upstream master