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

This reverts commit 1e6c34f2534189791ddb6a10b1fd3ca6d0383185.
Rebase from 'upstream'
Trimmed the branch to only the rocon_app_platform sub directory