Hopefully fixing unreliable test
Custom task category
Tentative fix for MID-1972 ($thisObject/name problem)
Merge branch 'master' of https://github.com/Evolveum/midpoint
MID-1730 - CapabilityEditor implementation, hopefully finished.
Merge branch 'master' into gui-devel