NUTCH-1827 Port issues 1467 and 1561 to 2.x

git-svn-id: https://svn.apache.org/repos/asf/nutch/branches/2.x@1633222 13f79535-47bb-0310-9956-ffa450edef68