Merge "Fix intermittent port_forwarding test failures"