Merge remote-tracking branch 'origin/master' into
NAS-2463-crawl-log-filter
# Conflicts:
# harvester/harvester-core/src/main/java/dk/netarkivet/harvester/webinterface/servlet/Heritrix3JobMonitorThread.java
# harvester/harvester-core/src/main/java/dk/netarkivet/harvester/webinterface/servlet/JobResource.java
# quickstart-vagrant-environment/redeploy.sh