Fix the generated code for enum-based map keys for json services#1602

stof merged 2 commits intoasync-aws:masterasync-aws/aws:masterfrom

stof:fix_code_generatorstof/aws:fix_code_generatorCopy head branch name to clipboard