Merge branch 'stable-3.7' into stable-3.8 * stable-3.7: Pull-replication plugin should warn about inconsistent timeouts Change-Id: I11450480b6d4001965d83a5386942432c21c9f10