Add default templates for HTTP 504 & 505
Merge branch 'pr/385'