WaypointTeam never worked and if you look at the code you can see its not very clean.
Merge pull request #903 from Winterleaf/MissionMarker

Looks good, don't see any problems. Merged.