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

This reverts commit a774e15b26b8c92e492a76032ac5f707ca3b2dac.
Rebase from 'upstream'
Trimmed the branch to only the rocon_concert sub directory