Merge branch 'calligra/2.9'

CCMAIL: calligra-devel@kde.org

Please, do check these merge conflicts. I have assumed that the changes
in 2.9 were not needed in master, so I took the master branch version
of them.

Conflicts:
	karbon/data/karbon.appdata.xml
	libs/db/expression.cpp
	libs/kotext/KoSection.cpp
	libs/kotext/KoSectionManager.cpp
	libs/kotext/KoSectionManager.h
	libs/kotext/commands/DeleteCommand.cpp
	plugins/reporting/maps/KoReportItemMaps.cpp
	words/part/dockers/KWDebugWidget.cpp