OR-818 revert default 404 page
Merge pull request #670 in OR/rse from OR/rse-gcrosmarie:OR-818 to master

* commit 'cc02ffd728efa47b7683a7b065460fc91d36b804':
  OR-818 revert default 404 page