Merge branch 'selftests-mptcp-refactoring-and-minor-fixes'