Merge branch 'clean' into fw_client

Conflicts:
	hbase-server/src/main/java/org/apache/hadoop/hbase/client/ServerCallable.java