[65-libyang-host_rebased] Addressed rebase conflicts

diff --cc src/lib/yang/Makefile.am
index 899bb78bef90a00e50a6aebcbf199d9831dd8055,6a6c5451a02e61a108eb902ce4ff308851e16cf5..4cc6efac0c3dfd0a88c7909ac4aea8604a4f1ecf
--- 1/src/lib/yang/Makefile.am
--- 2/src/lib/yang/Makefile.am
+++ b/src/lib/yang/Makefile.am
@@@ -16,9 -15,9 +16,10 @@@ libkea_yang_la_SOURCES += translator_op
  libkea_yang_la_SOURCES += translator_option_def.cc
  libkea_yang_la_SOURCES += translator_option_def.h
  libkea_yang_la_SOURCES += translator_pool.cc translator_pool.h
+ libkea_yang_la_SOURCES += translator_host.cc translator_host.h
  libkea_yang_la_SOURCES += yang_models.h
  
 +
  libkea_yang_la_LIBADD =  $(top_builddir)/src/lib/asiolink/libkea-asiolink.la
  libkea_yang_la_LIBADD += $(top_builddir)/src/lib/cc/libkea-cc.la
  libkea_yang_la_LIBADD += $(top_builddir)/src/lib/log/libkea-log.la
@@@ -36,7 -35,7 +37,8 @@@ libkea_yang_include_HEADERS = 
        sysrepo_error.h \
        translator.h \
        translator_control_socket.h \
 +      translator_database.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