Merge "Bug 1367 - Fix NPE in cors filter"