Reordered some lines and comments to make it easier to manually diff/ merge with gradle branch.
Reordered some lines and comments to make it easier to manually diff/ merge with gradle branch.

apache/solr,apache/solr,apache/solr,apache/solr,apache/solr