Merge "Fix rest_client's expected_success for non int status"