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

This reverts commit c4b178c07148311b8e1fed0abe471f5296fa042e.
Rebase from 'upstream'
Trimmed the branch to only the test_nodelet sub directory