Updated a bunch of tabbing in this file.
Merge remote-tracking branch 'origin/remove_ssh_trusty' into remove_ssh_trusty