Add Remote component to upgrade
Merge pull request #2423 from mitchellvanw/develop

Add Remote component to upgrade
Remove duplicate insert of SSH alias
Merge pull request #2436 from bryannielsen/patch-1

Remove duplicate insert of SSH alias
Merge remote-tracking branch 'upstream/develop' into develop