fixing query tests (disabling definition assertion because of dynamic definitions)..
Merge branch 'master' of github.com:Evolveum/midpoint