Ensure status in ErrorPageFilter defaults to 200

Fixes gh-1369. Note that this is caused by the ErrorPageFilter, so
only a problem when deployed as a WAR.
Merge branch '1.1.x'