LUCENE-5900: More Version cleanup (merged 1620509)

git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/branches/branch_4x@1620510 13f79535-47bb-0310-9956-ffa450edef68
Revert accidental commit (was still working on merge)

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