Resolved merge conflicts

.istanbul.yml

binding.gyp

build.json

examples/node/greeter_client.js

examples/node/greeter_server.js

examples/node/package.json

examples/node/route_guide/route_guide_client.js

examples/node/route_guide/route_guide_server.js

examples/python/README.md

examples/python/helloworld/helloworld_pb2.py

grpc.gyp

package.json

src/core/channel/client_channel.c

src/core/client_config/lb_policies/pick_first.c

src/core/iomgr/closure.c

src/core/iomgr/closure.h

src/core/iomgr/tcp_server_windows.c

src/node/LICENSE

src/node/README.md

src/node/ext/node_grpc.cc