Support aggregation_timestamp from configuration
Merge branch 'master' of github.com:SharadGandhi/naarad