fix the add of the ssh public key into authorized_keys
Merge branch 'master' into 12.04