HBASE-9870 HFileDataBlockEncoderImpl#diskToCacheFormat uses wrong format

git-svn-id: https://svn.apache.org/repos/asf/hbase/trunk@1541629 13f79535-47bb-0310-9956-ffa450edef68
HBASE-9849 [REST] Forbidden schema delete in read only mode (Julian Zhou)

git-svn-id: https://svn.apache.org/repos/asf/hbase/trunk@1541644 13f79535-47bb-0310-9956-ffa450edef68
Merge remote branch 'origin/trunk' into trunk-gd
Merge remote branch 'origin/trunk-gd' into fb-YAHOO-317-trunk-gd