fix for MID-1851
Merge branch 'master' of github.com:Evolveum/midpoint