Make identities matching case insensitive (#1485480)
Move these two fixes to the 0.9.4 release
Merge commit 'v0.9.4' into rutgers_release-0.9