Merge "Remove RestClientException inheritance"