Merge updated "no such identity file" patch.

PR:		bin/178060