Merge "Fixes sdnvpn (again)" into stable/colorado