Fix compiler warnings. Refs #9026.
Merge branch 'feature/9026_composite_catalog' into develop