Bug 969185 - update to simplified mozsvc.metrics infrastructure;