Decode enums that mix in str or int and int enum dict keys

Decode enums that mix in str or int and int enum dict keys #6856