Merge "Fix join scenario with provision discovery" into jb-mr1-dev