Ust 3099/dev/3100 clean the legacy sshconfiguration technique

To be merged on the 2.5 (master) branch.