fixed bugs in matchObject MID-1828
Merge branch 'master' of github.com:Evolveum/midpoint