Merged revision(s) 1650739 from lucene/dev/trunk: LUCENE-6173: Use Objects.hash() for simplicty. Also unbreak branch_5x