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

This reverts commit 58082292eea8e3ece15a0ac4403101ff5b7f816e.
Rebase from 'upstream' (no changes)
Trimmed the branch to only the nao_bringup sub directory