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

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