Merge "Moved nameser.h and namser_compat.h to public include dir"