Update retryhandler to handle change in error response structures

Updated unit tests as well.
Merge branch 'retry-error-codes' into develop

* retry-error-codes:
  Update retryhandler to handle change in error response structures