Merge "Prevent NPE in the SshLog" into stable-2.11