SOLR-5473 one state.json per collection , SOLR-5474 support for one json per collection

git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1607418 13f79535-47bb-0310-9956-ffa450edef68
SOLR-6157: Disable this test for now as it is still hanging on Jenkins.

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