s4:ntlmssp Merge ntlmssp structures with version from source3/