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

This reverts commit 6ff69f956c6485309f38deb7f4fe3187524f572d.
Rebase from 'upstream'
Trimmed the branch to only the node_manager_fkie sub directory