Merge "Fixed cleanup of propagated SshScopes" into stable-2.4