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

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