recent 0.94 failures

[lars hofhansl]

https://builds.apache.org/job/HBase-0.94/


Prime suspects are: HBASE-7599 (Devaraj), and HBASE-7638 (Sergey).
If anybody has any ideas.

Otherwise I'll start with reverting these changes.

-- Lars