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

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