BUG Don't redirect to ErrorPage in CMS with x-cms-edit-link
Merge pull request #739 from halkyon/x-cms-edit-errorpage

BUG Don't redirect to ErrorPage in CMS with x-cms-edit-link