Merge "Switch to threading model of socketserver" into feature/zuulv3