LUCENE-3069: merge 'temp' codes back

git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/branches/lucene3069@1516860 13f79535-47bb-0310-9956-ffa450edef68
fix bug in version incr

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