Merge changes I1f5cebbc,I43a031a5

* changes:
  Use inclusive language in diff script
  Use inclusive language in diff tool