MVP-724 Fix the Martini CORS handler

This fixes the Martini CORS handler for the channels code. Also submitted upstream, but forked to get the fix out so that we're unblocked.

/cc @cameront @oflorescu @peaches