Fixing test spring contexts
Merge branch 'master' of github.com:Evolveum/midpoint