refs #6730. Fix warnings.
Merge branch 'feature/6730_factory_redesign' into develop