merge develop -D org -I include -E exclude: PR 353 (10769 fix - Win server installation (rebased onto develop))
merge develop -D org -I include -E exclude: PR 354 (Improve description of Jenkins jobs in the documentation (rebased onto develop))
merge develop -D org -I include -E exclude: PR 355 (Update to nat port mappings on VDI web page)