[65-libyang-host_rebased] Addressed rebase conflicts

diff --cc src/lib/yang/Makefile.am
index 5078360b70707276595afe2dde3ff5c37fd585c1,fff4cd24f4f102167a1ce1146620a9af1bd74610..6a6c5451a02e61a108eb902ce4ff308851e16cf5
--- 1/src/lib/yang/Makefile.am
--- 2/src/lib/yang/Makefile.am
+++ b/src/lib/yang/Makefile.am
@@@ -33,7 -32,7 +34,8 @@@ libkea_yang_include_HEADERS = 
        adaptor.h \
        sysrepo_error.h \
        translator.h \
 +      translator_control_socket.h \
+       translator_host.h \
        translator_option_data.h \
        translator_option_def.h \
        translator_pool.h \

diff --cc src/lib/yang/tests/Makefile.am
Simple merge