Added conformance tests to Bazel BUIDL file.

Protcol Buffers v3.0.0-alpha-1

Protocol Buffers v2.6.1

Update CHANGES.txt to include a bug fix.

merge 2.6.0 to trunk