* Resolved some test failures that showed up during the merge. Conflicts: lib/google/api_client/discovery/api.rb