Bug-2277: fix the Leader test failing in jenkins

Change-Id: I149d643b517df5010595962cbdf616c2b2fb9945
Signed-off-by: Kamal Rameshan <kramesha@cisco.com>
Merge "Bug-2277: fix the Leader test failing in jenkins" into stable/helium