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

This reverts commit f908c0bbfd06774bd49a8267685b1891a9f5b1ed.
Rebase from 'upstream'
Trimmed the branch to only the rocon_test sub directory