EUCA-7411 log4j.xml changes to format cloud-cluster.log the same as cloud-output.log
EUCA-7412 fix the issue with incoming timestamps to set milliseconds to 0 (fixing an issue with timestamp comparison) and only summing up disk stats at times when disk stats occur (not other stats).
Merge branch 'dev/ethomas/EUCA-6796-2' into testing