Merge branch 'stable-2.9' into stable-2.10

* stable-2.9:
  Downgrade SSHD to 0.9.0-4-g5967cfd

Change-Id: I8648d2abb6eb70638deedca6e394d00394bdb9f0