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

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