Merge "Remove Nova v3 API code from RestClient"