Conor/windows services

@remh 
@whatarthurcodes could you sort this out, so we can merge it for 5.2!