Sorted total disk metrics by timestamp (otherwise may not get evenly spaced metrics)
Added trace logging
Fixed EUCA-6270: intermittent metrics.  This was due to non-disk metrics (instead of disk metrics) being aggregated
Merge branch 'dev/ethomas/EUCA-6270-merge-2' into testing