Merged revision(s) 1535950 from lucene/dev/trunk:
LUCENE-5307: Fix topScorer inconsistency in handling QueryWrapperFilter inside ConstantScoreQuery, which now rewrites to a query removing the obsolete QueryWrapperFilter

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