Fix icons for plugins
Fix regression which broke local-path code completion of includes.

The regression was introduced in 6ac597c5e862b9891665025375a5feb,
where the is-local check was moved to a place, at which point
the line was stripped so much we cannot decide whether it was/is
a local include or not.

BUG: 329425
SVN_SILENT made messages (.desktop file)
Try not to crash.

While I can't reproduce the crash myself, hope it may help to fix it...

CCBUG: 336741
Fix the unit test.
SVN_SILENT made messages (.desktop file)
Merge remote-tracking branch 'origin/4.7'
Fix icons for plugins