GCP-7983 fix compile errors from previous commit
Merge branch 'listmanager_sidebyside' of https://github.com/digitalabs/BreedingManager into listmanager_sidebyside