Merge "init.cm: make directory for ssh" into cm-10.1