LUCENE-5103: A join on A single-valued field with deleted docs scored too few docs.  Did a little refactoring of the inner scorers too.

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