reduce locking
Merge branch '1.1' of ssh://jreimann@gerrit.intra:29418/org.openscada.atlantis.git into 1.1