Fix error_json into error_text
Fix api test with error_text
Merge branch 'feature/replace-error-response' into staging/master
Merge branch 'staging/master'