o.c.u.pvmanager.*: synch to 2.1-SNAPSHOT
Merge branch '3.2.x' of git@github.com:ControlSystemStudio/cs-studio.git into 3.2.x