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

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