Merge "Enable test_statsd test" into feature/zuulv3