BUG 1096470 Windows enable rdp  r=dustin
Merge default -> production