Merge branch 'Indore-10.0.x' into Indore-2017.1.x

diff --cc git-server/src/jetbrains/buildServer/buildTriggers/vcs/git/PluginConfigImpl.java
index a3a0f02e9898ba489f49e8dbe3970c0665ffff2f,091c77c98df178d52612b23ed32b1910f4a98a3e..5c79879b28e511b863276cfef0c653f8a2791e3f
--- 1/git-server/src/jetbrains/buildServer/buildTriggers/vcs/git/PluginConfigImpl.java
--- 2/git-server/src/jetbrains/buildServer/buildTriggers/vcs/git/PluginConfigImpl.java
+++ b/git-server/src/jetbrains/buildServer/buildTriggers/vcs/git/PluginConfigImpl.java
@@@ -76,7 -76,7 +76,8 @@@ public class PluginConfigImpl implement
    private static final String MONITORING_FILE_THRESHOLD_SECONDS = "teamcity.git.monitoringFileThresholdSeconds";
    public static final String CREATE_NEW_CONNECTION_FOR_PRUNE = "teamcity.git.newConnectionForPrune";
    public static final String IGNORE_MISSING_REMOTE_REF = "teamcity.git.ignoreMissingRemoteRef";
 +  private static final String ACCESS_TIME_UPDATE_RATE_MINUTES = "teamcity.git.accessTimeUpdateRateMinutes";
+   private static final String MERGE_RETRY_ATTEMPTS = "teamcity.git.mergeRetryAttemps";
    private static final String GET_REPOSITORY_STATE_TIMEOUT_SECONDS = "teamcity.git.repositoryStateTimeoutSeconds";
    private final static Logger LOG = Logger.getInstance(PluginConfigImpl.class.getName());
    private final static int GB = 1024 * 1024 * 1024;//bytes

diff --cc git-server/src/jetbrains/buildServer/buildTriggers/vcs/git/ServerPluginConfig.java
index ceb9d6a155ce845343384a18c177e8a56dd53b6f,e8284f461a60a0ad1662a943b27b6a2de7707158..14e8ee2110b639b0f6121a88734556ce959a0b87
--- 1/git-server/src/jetbrains/buildServer/buildTriggers/vcs/git/ServerPluginConfig.java
--- 2/git-server/src/jetbrains/buildServer/buildTriggers/vcs/git/ServerPluginConfig.java
+++ b/git-server/src/jetbrains/buildServer/buildTriggers/vcs/git/ServerPluginConfig.java
@@@ -147,7 -147,7 +147,9 @@@ public interface ServerPluginConfig ext
  
    boolean createNewConnectionForPrune();
  
 +  long getAccessTimeUpdateRateMinutes();
 +
    boolean ignoreMissingRemoteRef();
+ 
+   int getMergeRetryAttempts();
  }

diff --cc git-tests/src/jetbrains/buildServer/buildTriggers/vcs/git/tests/PluginConfigBuilder.java
Simple merge