Merge "Added scripts for building collectd RPM"