Fixing QueryForm tool and update build config file
Merge branch 'master' of github.com:geosolutions-it/mapstore into c027