Merge pull request #744 from jay-hodgson/develop

merge from release-24
SWC-1103: try to parse the reason for the error if BadRequestException
Merge branch 'SWC-1103-release-24' into develop