First set of fixes for snapshots tests
Merge branch 'jon_7290_2' of https://github.com/AleksandrShulman/hbase into jon_7290_2

Conflicts:
	hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestSnapshotMetadata.java