Print win service info in admin diagnostics
Correct indentation (wrt. PR 458)
Merge pull request #588 from bpindelski/rebased/develop/win_diag-dev_4_4

Print win service info in admin diagnostics (rebased onto develop)