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

This reverts commit b30318287d53246340cf0170db50e53de88a4866.
Rebase from 'upstream'
Trimmed the branch to only the nao_bringup sub directory