Change visibility of JBTerminalSystemSettingsProvider from package to public
Move pluginbase back to restore plugin imports.
Merge branch 'terminalsettings_visibility' of https://github.com/xfournet/intellij-community into xfournet-terminalsettings_visibility
Merge branch 'xfournet-terminalsettings_visibility'
Merge branch 'master' of git.labs.intellij.net:idea/community