The version 1.10.4 contains the local patch for CATKIN_ENABLE_TESTING, and hence the local patch can be removed.
The control toolbox contains modules that are useful across all controllers.