revert some changes to allow simpler merging

Changes

@@ -1,15 +1,48 @@
-2.041000 - 2019-02-24
-
-  [ENHANCEMENTS]
-
-  * #490 use new checks for ports having phones
-  * #494 update Cisco ASA ssh collector (stromsoe)
-  * #510 store ifindex in Device Port Properties table (rc9000)
+2.040007 - 2019-03-06
 
   [BUG FIXES]
 
-  * #492 Port Control uses VLAN config check (inphobia)
+  * #521-redux Search Node Date Range not working (ollyg)
+
+2.040006 - 2019-03-04
+
+  [BUG FIXES]
+
+  * #527 update List::MoreUtils version requirement
+
+2.040005 - 2019-03-04
+
+  [BUG FIXES]
+
+  * #526 fix discover syntax bug
+
+2.040004 - 2019-03-03
+
+  [NEW FEATURES]
+
+  * #510 store ifindex in Device Port Properties table (rc9000)
+  * new discover_waps and discover_phones boolean settings (ollyg)
+
+  [ENHANCEMENTS]
+
+  * #428 Port-Channels now showing in netmap (ollyg)
+  * #490 use new LLDP capability checks for ports having phones (ollyg)
+  * #494 update Cisco ASA ssh collector (stromsoe)
+
+  [BUG FIXES]
+
+  * #492 Port Control incorrectly uses VLAN config check (inphobia)
   * #493 HTML tag fix (inphobia)
+  * #498 Map with VLAN filter omits unconnected devices (ollyg)
+  * #499 netdisco-do renumber reports wrong ip (inphobia)
+  * #500 no more duplicate entries in vlan filter (ollyg)
+  * #505 renumbering device missed a few tables (ollyg)
+  * #512 fix regression in phone/wap discovery exclusion (ollyg)
+  * #514 ipinventory report returns consistent data (inphobia)
+  * #520 make sure aggports have a master<->slave (ollyg)
+  * #521 Search Node Date Range not working (ollyg)
+  * #522 TypeAhead.pm can reference empty data (inphobia)
+  * fix bug showing no nodes when only one matches in netmap (ollyg)
 
 2.040003 - 2019-01-18