Revert "Trimmed the branch to only the tools/roslaunch sub directory"

This reverts commit fa3845543d7c14b52166e414fb58fb9f45be26c7.
Rebase from 'upstream'
Trimmed the branch to only the tools/roslaunch sub directory