ObjectiveC migrator. Change naming hueristic for
deprecated categories, fixes a typo reported by
Jordan.


git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@193759 91177308-0d34-0410-b5e6-96231b3b80d8