Smaller clang diagnostic scope.
Merge pull request #1847 from tewha/smaller-diagnostic-scope

Smaller clang diagnostic scope.
Update CHANGES for 2.1.0
Update CHANGES for 2.2.0
Bumping version to 2.2.0