Fixing failed test in model-intest.
Reducing accidental use of "object" element name.
Fix for MID-1920.
Fix for MID-1921.
Fix for MID-1950.
Merge branch 'master' of https://github.com/Evolveum/midpoint