NUTCH-2539 (#300)

* Merge branch 'master', remote branch 'origin'

* Squashed commit of the following:

commit 68363b1
Author: Semyon Semyonov <semyon.semyonov@mail.com>
Date:   Mon Mar 19 14:48:11 2018 +0100

    added description to crawldb.url.normalizers

commit b53039e
Author: Semyon Semyonov <semyon.semyonov@mail.com>
Date:   Mon Mar 19 14:27:25 2018 +0100

    misspelling in nutch-default crawldb.url.filters

commit 73e3f64
Author: Semyon Semyonov <semyon.semyonov@mail.com>
Date:   Mon Mar 19 14:23:26 2018 +0100

    db.url.filters and db.url.normalizers renamed to crawldb.* for the code match

conf/nutch-default.xml

@@ -548,15 +548,21 @@
 </property>
 
 <property>
-    <name>db.url.normalizers</name>
+    <name>crawldb.url.normalizers</name>
     <value>false</value>
-    <description>Normalize urls when updating crawldb</description>
+    <description>
+	!Temporary, can be overwritten with the command line!
+	Normalize urls when updating crawldb
+    </description>
 </property>
 
 <property>
-    <name>db.url.filters</name>
+    <name>crawldb.url.filters</name>
     <value>false</value>
-    <description>Filter urls when updating crawldb</description>
+    <description>
+	!Temporary, can be overwritten with the command line!
+	Filter urls when updating crawldb
+    </description>
 </property>
 
 <property>