Rebase Upstream
Squashed 'qmf/' changes from d0754cc..bcc4578

bcc4578 Create default .conf file for logs with logging disabled.
3d4ed22 Remove old test cases from test.xml
c4aefac Add iconPath property to QMailAccount

git-subtree-dir: qmf
git-subtree-split: bcc4578732b757d606e61aba631a6ed2e3c63581
Merge commit 'ee4e897ab24dcef1c285f236cf57d8c7eaf16005'

Conflicts:
	qmf/src/libraries/qmfclient/qmailstore_p.cpp
	qmf/tests/qt5/tests.xml
	qmf/tests/tests.xml