o.c.u.pvmanager.epics: another tentative to fix the deadlock when using JNI
Merge branch '3.2.x' of git@github.com:ControlSystemStudio/cs-studio.git into 3.2.x