HBASE-7796 [snapshot 130201 merge] Fix TestSnapshotFromClient and TestFlushSnapshotFromClient