Merge branch 'Plasma/5.2'

Conflicts:
applets/icontasks/metadata.desktop
containments/folder/package/metadata.desktop
kcms/access/kcmaccess.desktop
kcms/baloo/kcm_baloofile.desktop
kcms/bell/bell.desktop
kcms/desktoppaths/desktoppath.desktop
kcms/lookandfeel/autotests/lookandfeel/metadata.desktop
kcms/lookandfeel/kcm_lookandfeel.desktop
kcms/lookandfeel/package/metadata.desktop
kcms/useraccount/kcm_useraccount.desktop