Conflicts:
- gRPC.podspec
  - Only had non-trivial changes in the core file list, which will need to be
    regenerated (in gRPC-Core.podspec).
- src/objective-c/BoringSSL.podspec
  - Had trivial conflicts in the version.
- src/objective-c/examples/RemoteTestClient/RemoteTest.podspec
  - Trivial conflicts in quoting.
- src/objective-c/examples/Sample/Sample.xcodeproj/project.pbxproj and
src/objective-c/examples/SwiftSample/SwiftSample.xcodeproj/project.pbxproj
  - The master version is used, pending testing. The 0.14 version had emoji and
    some unneeded entries.
- src/objective-c/tests/Podfile
  - Added CronetFramework pod, and warning silencing from master.
- templates/gRPC.podspec.template
  - Deleted.
- third_party/protobuf
  - Using master commit, but need to verify if it works for frameworks.

Add a maybe-temporary way for apps to clear the channel cache

fix for working with compressed data. Fixes #6746.

Use open-source defaults to propagate Python plugin configuration

Fix bug with override_server flag in run_interop_tests.py

Dont create errors redundently in chttp2_transport.c

implemented eventfd_check_availability

Fix Python server interop spec noncompliance

PHP: fix shutdown hang issue

Updated git clone URL

fixed size_t format string

Changed default string type to be str

Build experimental nugets with dotnet CLI

Fix Cocoapods linter issues with gRPC-Core.podspec

Make transport-level errors be reflected in status messages on calls

Re-enable two Node credentials tests

This impacts the following APIs:
  Metadata: Key is always a str, Value is bytes for binary metadata,
    str otherwise
  Call Details: str type
  gRPC method: str type
  hostname/target: str type

Fix Cocoapods linter issues with BoringSSL.podspec

Also fix spelling mistakes in the spec itself.

Convert windows dll filename to bytes

Lowered six dependency version to 1.5.2

Build ObjC examples in travis

Removed _connectivity_channel tests

Trace statements in epoll poller (enabled by default to debug the recent perf regression)

This works around the Cocoapods' linter header_mapping_dir restrictions.
Incidentally, it also removes the need to set build settings in the user
target.