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

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