Merged revision(s) 1622734 from lucene/dev/trunk:
Use propertyresource instead string in common-build.xml

git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/branches/branch_4x@1622735 13f79535-47bb-0310-9956-ffa450edef68
SOLR-6447: bin/solr should pass -DnumShards=1 for bootstrapping collection1 when starting in cloud mode

git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/branches/branch_4x@1622737 13f79535-47bb-0310-9956-ffa450edef68
SOLR-6467: bin/solr script should direct stdout/stderr when starting in the background to the solr-PORT-console.log in the logs directory instead of bin.

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