EUCA-6160 SimpleDateFormat is not thread safe, so I wrapped it in a ThreadLocal
EUCA-6160 moved the SimpleDateFormat from AlarmManager into Timestamps.java (create one per method invocation, as other methods so don't need ThreadLocal as earlier
Changed wording of exception from 'user metatada' to 'user data' (EUCa-7009)
Changed GMT in dates to UTC and fixed the literal 'Z' timestamp issue in the cloudwatch json time format
EUCA-6413 Purge the absolute_metric_history table for data over two weeks old. (cloud watch)
Wrong name in class to remove
EUCA-6413 Purge the absolute_metric_history table for data over two weeks old. (cloud watch)
Merge branch 'dev/ethomas/EUCA-6413' into dev/ethomas/EUCA-6413-merge
Merge branch 'dev/ethomas/EUCA-6160' into maint/3.3/testing
Merge branch 'dev/ethomas/EUCA-6413-merge' into maint/3.3/testing
Merge branch 'dev/ethomas/EUCA-7009' into maint/3.3/testing