Cherry-pick fixes from feature/10132_new_CNCS_geom into next

Changes:

    Refs #10132. Switching to new geometry.

     * Renaming current geometry file.
     * Changing dates for now old geometry file.
     * Adding new geometry file.
    (cherry picked from commit 6abd64109a7fa0a198206238257337fb2e6e073a)