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

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