MB-51835 Merge branch 'cheshire-cat' into neo

* cheshire-cat:
  MB-51835 Fix 'master-password' and 'server-eshell' crashing server
  MB-49557 [BP] Don't leak cookie in master-password

Change-Id: Ia9aff726220fa048a1b7375fb981b0e1649e6cb7

Author: yonsken

cbmgr.py

@@ -1681,7 +1681,7 @@ def prompt_for_master_pwd(self, node, cookie, password, cb_cfg_path):
 
         name = 'executioner@cb.local'
         args = ['-pa', CB_NS_EBIN_PATH, CB_BABYSITTER_EBIN_PATH, '-noinput', '-name', name, '-proto_dist', 'cb',
-                '-eval', 'erlang:set_cookie(list_to_atom(os:getenv("CB_COOKIE"))).', '-epmd_module', 'cb_epmd',
+                '-eval', 'erlang:set_cookie(node(), list_to_atom(os:getenv("CB_COOKIE"))).', '-epmd_module', 'cb_epmd',
                 '-kernel'] + CB_INETRC_OPT + \
             ['dist_config_file', f'"{dist_cfg_file}"', '-run', 'encryption_service',
              'remote_set_password', node]
@@ -2074,7 +2074,7 @@ def execute(self, opts):
             env["CB_COOKIE"] = cookie
 
             args = [path, '-name', name, '-setcookie', 'nocookie', '-hidden', '-eval',
-                    'erlang:set_cookie(list_to_atom(os:getenv("CB_COOKIE"))).',
+                    'erlang:set_cookie(node(), list_to_atom(os:getenv("CB_COOKIE"))).',
                     '-remsh', node, '-proto_dist', 'cb', '-epmd_module', 'cb_epmd', '-pa', CB_NS_EBIN_PATH, '-kernel',
                     'dist_config_file', f'"{temp_name}"'] + CB_INETRC_OPT