Issue #3525174 by benjifisher, smustgrave, greggles, catch, larowlan, mcdruid: Clean up unserialize() in the config system (cherry picked from commit 4cfe1582)
