Change CATF behavior to insert OTHER_FILES lines at exact location of CATF line. This is done to give control of precedence of overlapping features.

Change CATF behavior to insert OTHER_FILES lines at exact location of CATF line. This is done to give control of precedence of overlapping features. #1658