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

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