Merge "fix patrole-multinode-admin non-voting gate"