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

This reverts commit fffd1b58118d064d089b2474b5f1af5c723c9758.
Rebase from 'upstream' @ version '1.9.41'
Trimmed the branch to only the tools/roslaunch sub directory