HBASE-12624 Remove rename_snapshot.rb from code as there is no equivalent renameSnapshot api in Admin class (Ashish Singhi)
HBASE-11639 [Visibility controller] Replicate the visibility of Cells as
strings : Addendum adding break (Ram)
Add timeout on TestDefaultLoadBalancer#testBalancerCluster to see if we can stop it hanging as a zombie in precommit builds
HBASE-12431 Use of getColumnLatestCell(byte[], int, int, byte[], int, int) is Not Thread Safe (Jingcheng Du)

(cherry picked from commit c45772e76a581838ea89ff303d0ff67ceaa82845)
HBASE-12634 Fix the AccessController#requireGlobalPermission(ns) with NS

Signed-off-by: Matteo Bertozzi <matteo.bertozzi@cloudera.com>
HBASE-12204 Backport HBASE-12016 'Reduce number of versions in Meta table. Make it configurable' to branch-1
HBASE-12635 Delete acl notify znode of table after the table is deleted (Liu Shaohui)
HBASE-12637 Compilation with Hadoop-2.4- is broken
HBASE-12622 user_permission should require global admin to display global and ns permissions
HBASE-12632 ThrottledInputStream/ExportSnapshot does not throttle
HBASE-12565 Race condition in HRegion.batchMutate() causes partial data to be written when region closes

Signed-off-by: stack <stack@apache.org>

Conflicts:
	hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HRegion.java
HBASE-10560 Per cell TTLs
HBASE-12642 LoadIncrementalHFiles does not throw exception after hitting hbase.bulkload.retries.number setting