test code cleanup, perf. tests improvements.
Merge branch 'master' of github.com:Evolveum/midpoint
match object implemented, not tested yet.