UP-3912: Correct merge issue with this file

Correcting merge issue with listChannels.jsp (this includes the latest file changes)