Merge remote-tracking branch 'remotes/origin/master' into pycharm/docker

diff --cc platform/platform-impl/src/com/intellij/remote/RemoteConnectionCredentialsWrapper.java
Simple merge

diff --cc python/src/META-INF/python-core.xml
Simple merge

diff --cc python/src/com/jetbrains/python/debugger/PyDebugProcess.java
Simple merge

diff --cc python/src/com/jetbrains/python/remote/PythonRemoteInterpreterManager.java
Simple merge

diff --cc python/src/com/jetbrains/python/sdk/PythonSdkType.java
Simple merge