Merge cherry-picked commits from upstream 1.22#46

sebastian-nagel merged 27 commits into

cccommoncrawl/nutch:ccfrom

merge-upstream-master-1.22commoncrawl/nutch:merge-upstream-master-1.22Copy head branch name to clipboard