354538

Commit 54fae03615dcae3c1f6304f4c89be8abb6c0dcf3 which reverted the rever
for bug 354538 has unfortunately removed one part of the fix for bug
518687 (in clearModelToManager()).

This commit restores the missing part from the fix for 518687.

Change-Id: I27ae5b8207a6a86bf17c155c3cd92b2ed8cf89e8
Signed-off-by: Andrey Loskutov <loskutov@gmx.de>