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

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