[ros-diffs] [pschweitzer] 62660: [CDFS] - Fix broken if statement - Remove deadcode CID #502181 CID #502438 CID #716663