This merge creates a new set of channel list files for O3, copied from O2. I also revert the following commits to bring the O2 files back to their state on September 1 2017: