HBASE-12019 hbase-daemon.sh overwrite HBASE_ROOT_LOGGER and HBASE_SECURITY_LOGGER variables (Sebastien Barrier)

Fixed conflict.
Conflicts:
	bin/hbase-daemon.sh
HBASE-12020 String formatting on each RPC Invoke. (Vladimir Rodionov)
HBASE-12022 Payloads on Failure attempt to serialize the byte[] into strings. (Vladimir Rodionov)
HBASE-11957 Backport to 0.94 HBASE-5974 Scanner retry behavior with RPC timeout on next() seems incorrect. (Liu Shaohui original patch by Anoop Sam John)
HBASE-12023 HRegion.applyFamilyMapToMemstore creates too many iterator objects. (Vladimir Rodionov)
Amend HBASE-12023 HRegion.applyFamilyMapToMemstore creates too many iterator objects; More cases (Vladimir Rodionov)