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

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