Clean up ConstantScoreAutoRewrite, fix merge
Merge remote-tracking branch 'upstream/lucene_4_3_0' into lucene_4_3_0