Make source key installing backwards compatible
Merge branch 'ps-use-ssh-key-from-settings' into ps-testing