Merged revision(s) 1617102 from lucene/dev/trunk:
Minor improvements to other groovy scripts. Fix bug with missing <local/>

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