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

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