[0.90 branch] Backport HBASE-6334 to 0.90

See HBASE-6334 for details.

The issue is that HBASE-6334 detects both HBASE-4195 (which should be backported to 0.90 – I'll file another JIRA for that) and HBASE-2856 (which is a known issue in 0.90 that won't be fixed because it requires a change to the HFile format). So in 0.90, we need a way to only catch HBASE-4195 failures and ignore HBASE-2856 failures.

Luckily, HBASE-4195 only occurs within a column family, while HBASE-2856 occurs between column families, so we just need to add a little to the backport to differentiate.