Merge branch 'stable-3.1' into stable-3.2

* stable-3.1:
  ReplicationIT: Enable task deletion when testing delete branch
  ReplicationIT: Test that branch deletion is replicated
  Make SecureCredentialsFactory public

Change-Id: I07b9127c3e6930b96a38e115265e7cf7cff92b76