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

This reverts commit 7e8e369731242c93421188843028d52016d83fed.
Rebase from 'upstream' (no changes)
Trimmed the branch to only the nodelet sub directory