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

This reverts commit 02e471de25e7f2eadbe44bd4daff5d9165e5c4da.
Rebase from 'upstream' @ version '1.7.14'
Trimmed the branch to only the nodelet sub directory