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

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