3.6/f/control subdir

This branch moves the control socket related code to a subdirectory and contains a port of the related unit tests from the PE tree.