For ENG-4359, add some more support for joining nodes using local cluster