Merge "Bug 2194: Modify FindPrimary to check for leader"