Refs #9369 Fix rest of iterator issues.
Merge branch 'feature/9369_upgrade_history_gui' into develop