CMS-3989 CM application: edit button does not work in ContentItemViewToolbar
Merge remote-tracking branch 'origin/master' into CMS-3989