NSLS2: using common features
Merge branch '3.2.x' of ssh://git@github.com/ControlSystemStudio/cs-studio.git into 3.2.x
Merge branch '3.2.x' of ssh://git@github.com/ControlSystemStudio/cs-studio.git into 3.2.x