Added uptime calculation per machine.
Merge branch 'usage_dev_branch' of ssh://github.com/open-infinity/cmt into usage_dev_branch

Conflicts:
	cloud/cloud-repository/src/test/resources/sql/populate_tables.sql
Merge branch 'usage_dev_branch' of ssh://github.com/open-infinity/cmt into usage_dev_branch