Bastion: Added bastion triggers to the remaining SSH based macros.
Minor formatting.
Bastion: Fixed ~%sshExtra%~ .
Bastion: Onsite fixes.