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

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