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

This reverts commit c24d235bfaa59020e1a8591f8528fc8854aa3156.
Rebase from 'upstream' (no changes)
Trimmed the branch to only the nao_bringup sub directory