Merge "Refactor rest-client and identity v2-client"