Merge "Make rest_client module py34-compatible"