Merge remote-tracking branch 'apache/trunk' into snapshots-work

Conflicts:
	hbase-common/src/main/java/org/apache/hadoop/hbase/HConstants.java
	hbase-protocol/src/main/java/org/apache/hadoop/hbase/protobuf/generated/HBaseProtos.java
	hbase-protocol/src/main/protobuf/hbase.proto
	hbase-server/src/main/jamon/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.jamon
	hbase-server/src/main/java/org/apache/hadoop/hbase/HColumnDescriptor.java
	hbase-server/src/main/java/org/apache/hadoop/hbase/MasterAdminProtocol.java
	hbase-server/src/main/java/org/apache/hadoop/hbase/backup/HFileArchiver.java
	hbase-server/src/main/java/org/apache/hadoop/hbase/master/HMaster.java
	hbase-server/src/main/java/org/apache/hadoop/hbase/master/MasterFileSystem.java
	hbase-server/src/main/java/org/apache/hadoop/hbase/protobuf/ProtobufUtil.java
	hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HRegion.java
	hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HRegionServer.java
	hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HStore.java
	hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/StoreFile.java
	hbase-server/src/main/java/org/apache/hadoop/hbase/zookeeper/ZKUtil.java
	hbase-server/src/main/resources/hbase-default.xml
	hbase-server/src/main/ruby/hbase/admin.rb
	hbase-server/src/test/java/org/apache/hadoop/hbase/TestHTableDescriptor.java
	hbase-server/src/test/java/org/apache/hadoop/hbase/backup/TestHFileArchiving.java
	hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestStoreFile.java