LUCENE-2838: ConstantScoreQuery now directly supports wrapping a Query instance for stripping off scores