Merge branch '1.5.1-SNAPSHOT' of https://git-wip-us.apache.org/repos/asf/accumulo into 1.5.1-SNAPSHOT
ACCUMULO-2387 Use ACCUMULO_CONF_DIR to find config files in bootstrap_hdfs.sh

Signed-off-by: Eric Newton <eric.newton@gmail.com>
Merge branch '1.5.1-SNAPSHOT' into 1.6.0-SNAPSHOT