o Minor bugfixes (guard selection):
    - Use a single entry guard even if the NumEntryGuards consensus parameter
      is not provided. Fixes bug #17688.