rssh: don't append .local if it's already there
Merge remote-tracking branch 'upstream/master'