Merge remote-tracking branch 'origin/Plasma/5.1'
Conflicts:
applets/icontasks/plasma-applet-org.kde.plasma.icontasks.desktop
kcms/access/kcmaccess.desktop
kcms/lookandfeel/autotests/lookandfeel/metadata.desktop
kcms/lookandfeel/kcm_lookandfeel.desktop
kcms/lookandfeel/package/metadata.desktop
layout-templates/org.kde.plasma.desktop.defaultPanel/metadata.desktop