Fix mistake in merge conflict resolution.

Refs #8640
Merge branch 'feature/8640_restore_loaddetectorinfo_removal' into develop