Merge branch 'stable-2.15' into stable-2.16 * stable-2.15: Set SSH default port to 22 Change-Id: I7fa99711a5938542eae97858ddc3b998efd3a374