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

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