reviewed container ids problem, already was fixed, added test, code cleanup.
Merge branch 'master' of github.com:Evolveum/midpoint