Fix Mastership timstamping issue

Change-Id: I80cfa71f844ddf7d64dbff0458db193734a3f737
3 files changed