Refs #7775. Changing valid to on now old geometry.
Refs #7775. Renaming now old geometry file.
Refs #7775. New geometry file.
Refs #7775. Fixing timestamps.
Merge remote branch 'origin/feature/7775_new_cncs_geometry'