LUCENE-4571: improve minShouldMatch testing

git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1459521 13f79535-47bb-0310-9956-ffa450edef68
SOLR-4625: fix boosts and phrase slops on sub parsers

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