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

This reverts commit 964ac8da16d2fd6b4b2b849ae55946d9e991532a.
Rebase from 'upstream'
Trimmed the branch to only the nodelet sub directory