* Fixed issue with retry on malformed JSON response and added usecase for 500+ HTTP status code.
* Small clean up
small fix
Merge branch 'hotfix-t4' into develop