Use correct variable for home folder.

Use correct variable for home folder.
Allow multiple keys per user account.
Use correct parameter for .ssh directory owner and group.
Fix conflict from upstream.