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

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