Merge pull request #2970 from nrwahl2/nrwahl2-T565
Fix: based: CIB schema upgrade should always force a write