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

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