Tweaks that make 'master' closer to '4.0.x'
org.csstudio.sns.passwordprovider: Removed on 4.0.x branch

Not needed anyway
Merge pull request #335 from ControlSystemStudio/sync_master_and_4.x

Tweaks that make 'master' closer to '4.0.x'