Revert "Trimmed the branch to only the concert_service_waypoint_navigation sub directory"

This reverts commit 30dc50f8021832b30abb90319d160d0850190634.
Rebase from 'upstream'
Trimmed the branch to only the concert_service_waypoint_navigation sub directory