Refs #13573 -- Modified the key technique added in r13295 to be more robust against potential key collisions while keeping key names human-readable. Thanks to Alex for being finicky.
Refs #13573 -- Modified the key technique added in r13295 to be more robust against potential key collisions while keeping key names human-readable. Thanks to Alex for being finicky.

git-svn-id: 554f83ef17aa7291f84efa897c1acfc5d0035373@13299 bcc190cf-cafb-0310-a4f2-bffc1f526a37

svn2github/django,svn2github/django,svn2github/django