LPS-46270 and LPS-46272 - Fix regression in blogs and wiki portlets that makes them appear initially unconfigured (because the fallback keys are not being applied).