Merged revision(s) 1592075, 1592078 from lucene/dev/trunk: LUCENE-5639: Fix token class to correctly implement PoistionLengthAttribute