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

This reverts commit 31559c5f44b029d5228b0cd7df4351c65a581769.
Rebase from 'upstream' (no changes)
Trimmed the branch to only the rocon_concert sub directory