The version 0.3.6 contains the local patch for
CATKIN_ENABLE_TESTING, and hence the local patch can be removed.