LUCENE-5680: add aotmic DocValues updates

git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/branches/branch_4x@1598277 13f79535-47bb-0310-9956-ffa450edef68
SOLR-6120: zkcli.sh should expand solr.war automatically instead of throwing ClassNotFoundException

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