RPM specfile: remove duplicate modbus block
RPM specfile: remove macro accidentally re-added when handling merge conflict
RPM specfile: remove define accidentally re-added when handling merge conflict
RPM specfile: add missing %files section for modbus plugin

complement to a781eb2c5
RPM specfile: support for RHEL7
RPM specfile: fix bogus dates

modern rpmbuild versions appear to be more strict on this point.
RPM specfile: enable netlink plugin on RHEL > 5
Merge branch 'collectd-5.3' into collectd-5.4

Conflicts:
	contrib/redhat/collectd.spec
RPM specfile: enable lvm plugin on RHEL7
Merge branch 'collectd-5.4'
RPM specfile: take all new plugins and dependencies in account
src/configfile.c: Fix the default interval setting.

Also fixes a bug in global_option_get_time(): Values smaller than or
equal to zero are illegal and the default value should be returned.
Thanks to @anandkarthik for spotting this!

Fixes: #727
src/common.[ch]: Implement strtogauge().
battery plugin: Import code to read metrics from sysfs.

This started as a simple import of Andy Parkins' sysfsbattery plugin into
the battery plugin. Since the battery plugin is ancient and hasn't been
touched in a while, this quickly escalated to a much bigger refactoring.
Sorry!

On the other hand, this fixes a couple of bugs. For example, all metrics
were always dispatched with plugin_instance "0". This is correct for the
majority of laptops, of course, but in theory this could be wrong.

Also ACPI charging / discharging rate is reported as "current", when
modern batteries actually report "power". The sysfs code does this
correctly, ACPI still needs to be patched.

Fixes: #725