Merge remote-tracking branch 'gitlab/testing' into testing
Add skew to uptime in correct place.

Change-Id: I166a290f63066aa155ecb9fa1ab2e74a37dccb19
Merge branch 'testing' of github.com:eucalyptus/eutester into testing
Merge branch 'testing' of git.qa1.eucalyptus-systems.com:qa-repos/eutester into testing