[Maria-developers] [Branch ~maria-captains/maria/5.1] Rev 2723: Trivial fixes for windows compile failures