Merge "Fix running daemon with --disable-sshd flag"