Import changes from upstream libndr.