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
src/common.c: Fix strstripnewline().

Because the length of the string was decremented too late, the function
would actually overwrite the trailing null byte instead of the newline.
Merge branch 'collectd-5.3' into collectd-5.4