Merge branch 'pull_630' into 3.3.x
o.c.servicelocator: increase version
o.c.ndarray: typo in comment causing compile error
Merge branch '3.3.x' of https://github.com/ControlSystemStudio/cs-studio into 3.3.x
Merge pull request #636 from berryma4/3.3.x

Corrections for pull request #630