Group SSH auth options together; make consistent in formatting
Merge pull request #10647 from plastikos/ssh_options_reorg

Group SSH auth options together; make consistent in formatting