MastershipManagerTest plus tweaks to MastershipStore

Change-Id: Ie5d3201ce2297ae68cdafac4439168989dd804c5
5 files changed