SOLR-6646: Start script fails to detect solr on non-default port and then after 30s tails wrong log file (merge from trunk)

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