Ninja fix master to use the same MBean name as the ScheduleContext class
Merge branch 'master' into rax-stage

* master:
  Ninja fix master to use the same MBean name as the ScheduleContext class