[2.1] Upgrader - Fix issues with json conversion#9271

sbulen wants to merge 3 commits into

SimpleMachines:release-2.1SimpleMachines/SMF:release-2.1from

sbulen:21_upgr_fix_unserializesbulen/SMF:21_upgr_fix_unserializeCopy head branch name to clipboard