Merge branch 'stable-2.9' into stable-2.10

* stable-2.9:
  Inject InitStep members again before calling postRun.
  SSHD: Update to 0.13.0
  Bump SSHD Mina version to 2.0.8
  Bump Bouncycastle version to 1.51
  Update EncryptedContactStore to not use deprecated/removed methods

Change-Id: I4d67f79b9614289f222f9adcc8c513813ab3035c