Make sure that ssh keys don't get added with incorrect encoding types.
Remove original return call
Merge pull request #7850 from cro/develop

Make sure that incorrect ssh key encodings don't cause bad keys to be added to authorized_keys.