Tentative fix for MID-1972 ($thisObject/name problem)
Merge branch 'master' of https://github.com/Evolveum/midpoint