HBASE-11534 Remove broken JAVA_HOME autodetection in hbase-config.sh (Esteban Gutierrez)
HBASE-11537 Avoid synchronization on instances of ConcurrentMap (Mike Drob)
Merge remote-tracking branch 'remotes/origin/0.98' into 0.98