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

This reverts commit 113baf14c009f8c8498a95d7cd70326fcf055112.
Rebase from 'upstream' @ version '1.7.14'
Trimmed the branch to only the test_nodelet sub directory