Merge branch 'Plasma/5.0'

Conflicts:
CMakeLists.txt
containments/folder/plugin/internallibkonq/directory_bookmarkbar.desktop
containments/folder/plugin/internallibkonq/konqdndpopupmenuplugin.desktop
containments/folder/plugin/internallibkonq/konqpopupmenuplugin.desktop
kcms/access/kcmaccess.desktop
kcms/autostart/autostart.desktop
kcms/colors/colors.desktop
kcms/componentchooser/componentchooser.desktop
kcms/dateandtime/clock.desktop
kcms/desktoppaths/desktoppath.desktop
kcms/emoticons/emoticons.desktop
kcms/formats/formats.desktop
kcms/icons/icons.desktop
kcms/input/cursortheme.desktop
kcms/input/mouse.desktop
kcms/kded/kcmkded.desktop
kcms/keyboard/kcm_keyboard.desktop
kcms/kfontinst/kcmfontinst/fontinst.desktop
kcms/knotify/kcmnotify.desktop
kcms/ksmserver/kcmsmserver.desktop
kcms/ksplash/ksplashthememgr.desktop
kcms/launch/kcmlaunch.desktop
kcms/phonon/kcm_phonon.desktop
kcms/runners/kcm_plasmasearch.desktop
kcms/spellchecking/spellchecking.desktop
kcms/standard_actions/standard_actions.desktop
kcms/style/style.desktop
kcms/translations/translations.desktop
kcms/useraccount/kcm_useraccount.desktop
kcms/workspaceoptions/workspaceoptions.desktop