WL-1932 Join/Unjoin from site info, update for 10.x