Cherry-picking from d3cf598 / Switch from URI params to URI query string
Cherry-picking from commit 1ebeb2c / Remove unused uriparams variable + done TODO
Small improvement in documentation.
Progressing with documentation.
Revert demo config to working state
Merge branch 'master' into sslsupport

Conflicts:
	demo.conf
	docs/manual/config.rst