Changed references from MetricQueueItem to SimpleMetricEntity (previous refactoring did not apply to test code) to get TestAggregationQueue to compile
EUCA-6375 If postgres is running on port 8777 on startup before startup occurs, we try to stop it and restart it.
removed some commented out code
Merge branch 'dev/ethomas/EUCA-6375' into testing