Bug 409090 - Deadlock during renaming of entity

Change-Id: I0a057e321f915f9ffe37b0561badd82ea890540c