Upstream merge with conflicts.
Change ctd_offset to ctd_time_offset due to IDD change, and sio mule common bug fix.