Merge pull request #901 from jay-hodgson/SWC-1284

SWC-1284: remove BadRequestException special message handling now that r...
Merge branch 'release-37' into develop