Integrate xlinkboot code and work around some NodeID issues for now