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

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