HBASE-7753 [snapshot 130201 merge] Fix unresolved merge conflicts