Merge changes I0b51674f,I1ea6ebf9,I89076d93 into experimental

* changes:
  lint_hunks: show style violations in the index
  intersect_diffs: split out diff classes
  ftfy: update to match current astyle rule