Merge branch 'svn_18_3'

Conflicts:
	plugins/svn4idea/src/org/jetbrains/idea/svn/dialogs/browserCache/RepositoryLoader.java

diff --cc platform/platform-resources-en/src/misc/registry.properties
Simple merge

diff --cc plugins/svn4idea/src/org/jetbrains/idea/svn/SvnFileSystemListener.java
Simple merge

diff --cc plugins/svn4idea/src/org/jetbrains/idea/svn/SvnUtil.java
Simple merge

diff --cc plugins/svn4idea/src/org/jetbrains/idea/svn/SvnVcs.java
Simple merge

diff --cc plugins/svn4idea/src/org/jetbrains/idea/svn/dialogs/RepositoryBrowserDialog.java
Simple merge

diff --cc plugins/svn4idea/src/org/jetbrains/idea/svn/dialogs/browserCache/RepositoryLoader.java
Simple merge

diff --cc plugins/svn4idea/src/org/jetbrains/idea/svn/rollback/SvnRollbackEnvironment.java
Simple merge