(cherry picked from commit c82745432a962c817a8a7db92bb830fb6af01e33) Conflicts: hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/ha/ActiveStandbyElector.java
(cherry picked from commit c82745432a962c817a8a7db92bb830fb6af01e33) Conflicts: hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/ha/ActiveStandbyElector.java