* Use syntax that works in both Python 2 and 3 when iterating through a
dict that's going to be mutated during iteration
* Fixes `dictionary changed size during iteration` error
* Fixes#4932
(cherry picked from commit 9a928d5ffb)
Co-authored-by: Teddy Caddy <tcaddy@users.noreply.github.com>
