Merge pull request #3438 from collectd/collectd-5.10

Merge 5.10 into 5.11

diff --cc AUTHORS
index c1fa48d6e9528830a90ea32f3200d6136c081d53,a050e724143f43326bff5c593b1d67a274a55461..61a15f7a89227562c9327daecf1c625b174c9baa
--- 1/AUTHORS
--- 2/AUTHORS
+++ b/AUTHORS
@@@ -72,12 -65,9 +72,9 @@@ Andrew Bays <abays at redhat.com
  Andy Parkins <andyp at fussylogic.co.uk>
   - battery plugin: sysfs code.
  
- Aneesh Puttur <aputtur at redhat.com>
-  - connectivity plugin.
- 
  Andy Smith <ansmith at redhat.com>
   - AMQP 1.0 plugin.
 - 
 +
  Aneesh Puttur <aputtur at redhat.com>
   - connectivity plugin.