Merge "Fix how nc client and server are run in scenario tests"