Metrics Managers changes to be compatabile with bagheera-stable-0.9