Fixes #6031: wrong group during SSH key distribution
Merge pull request #620 from peckpeck/bug_6031/wrong_group_during_ssh_key_distribution

Fixes #6031: wrong group during SSH key distribution