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

This reverts commit 0310c84093ee5d3b31ab9482d6ce47456b23f568.
Rebase from 'upstream' (no changes)
Trimmed the branch to only the concert_conductor sub directory