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

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