STORM-279. cluster.xml doesn't take in STORM_LOG_DIR values. merge
conflicts resolved.