Bug 969184 - update for simplified mozsvc.metrics infrastructure;