o.c.d.pvmanager.probe: ignore timeouts if other errors arrived first.
Merge branch 'master' of git@github.com:ControlSystemStudio/cs-studio.git