*8177* Fix upgrade settings fetches (apply to OHS along with above patch for lib/pkp)