MBS-3990: provide link and options for redirecting to a beta site
MBS-3990: fixups, recommended by ocharles and otherwise
MBS-3990: add line comment about the cookie time
Merge branch 'mbs-3990-beta-cookie' into beta

* mbs-3990-beta-cookie:
  MBS-3990: add line comment about the cookie time
  MBS-3990: fixups, recommended by ocharles and otherwise
  MBS-3990: provide link and options for redirecting to a beta site