Lucene 5092 pull 4

LUCENE-5092

Resolved small conflict in ToChildBlockJoinQuery after LUCENE-5520