Fix coverity issue. Refs #9084.
Minor type consistency improvement. Refs #9084.
Merge branch 'feature/9084_create_catalog_manager' into develop