Ticket 10769 initial fix
Diagnostics and 'db script' comments
Changes suggested by Roger
Minor format stuff
Fixes suggested by Petr
Final fix
Merge pull request #353 from hflynn/rebased/develop/sysadmin-fixes

10769 fix - Win server installation (rebased onto develop)
Merge remote-tracking branch 'origin/develop'

Conflicts:
	omero/sysadmins/windows/server-installation.txt