SOLR-6397: zkcli script put/putfile should allow overwriting an existing znode's data

git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/branches/branch_5x@1647842 13f79535-47bb-0310-9956-ffa450edef68
SOLR-6855: bin/solr -e dih launches, but has some path cruft issues preventing some of the imports don't work

git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/branches/branch_5x@1647843 13f79535-47bb-0310-9956-ffa450edef68