Attempt to fix cpp error. Refs #9084.
Merge branch 'feature/9084_create_catalog_manager' into develop