o added collectd-apache module
o fixed collectd conf file conflict, apache