Merge ntlm fix for knife-windows 124 to 0-stable