[12091019] Changed text from 'elapsed units' to 'elapsed hours' to match the web client
Merge branch '2.0' into topic-metrics-2