Committing fix for SNMP Trapd traphandler config change. And clubbed 5 minute KPIs into 1 file for an hour.