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

Fixed conflict.
Conflicts:
	bin/hbase-daemon.sh
Merge remote-tracking branch 'remotes/origin/0.94' into 0.94