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

This reverts commit 967f5821941750d02c7e5efaee8dfdbb3091f5b0.
Rebase from 'upstream'
Trimmed the branch to only the rocon_app_manager sub directory