Merge changes I4e289c80,I0e73ec61 into sc-dev

* changes:
  ActiveModeWarden: Change existing secondary CMM role
  ConcreteClientModeManager: Refactor CMM to accept listener on role changes