Fix for SOLR-4615, pull solr.properties out prior to deciding on the new mechanism

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