Merge "Correct the http client auth issue" into casablanca