merge dev_5_0 -D org -I include -E exclude: PR 640 (Update docs for import and logging fixes)
merge dev_5_0 -D org -I include -E exclude: PR 646 (Improve server-template description in advanced configuration)