Fix for the right capability names
Merge branch 'master' into portforward_in_container
Fix
Put the reverseforward stuff in the right place
Fix remote addr