Fixes U4-4264 while we wait for angularification.
Merge pull request #387 from lars-erik/Fix-U4-4264

Fixes U4-4264 (dictionary tree collapses) while we wait for angularification.
Merge remote-tracking branch 'origin/7.1.4' into 7.1.3-variations