Clone of the 4.0.19 upgrade script from 9d60fbcd5

In case you had already come to 4.2.1, you wouldn't have run any of the
scripts that fix disabled OCFVs or CFs.  This should be a no-op for most
people.
Merge branch '4.2/disabled-article-cfs' into 4.2-trunk