Note that conflict resolution in bind10_src.py was not trivial: we needed to re-ensure that the ld path path for xfrout.