The version 1.11.4 contains the local patches for
CATKIN_ENABLE_TESTING, and hence the local patches can be removed.