merge from trunk : upload log & early sshd start