[65-libyang-host_rebased] Addressed rebase conflicts

diff --cc src/lib/yang/Makefile.am
index 9df3306b8b898c9465f09bd7d9aff17fe22ff3c5,e22d38855bbdf07dee33ac357ca7ded462022b78..c505bccaeb96606f5805c4db82f6b07efe476a6e
--- 1/src/lib/yang/Makefile.am
--- 2/src/lib/yang/Makefile.am
+++ b/src/lib/yang/Makefile.am
@@@ -10,8 -10,7 +10,9 @@@ libkea_yang_la_SOURCES += sysrepo_error
  libkea_yang_la_SOURCES += translator.cc translator.h
  libkea_yang_la_SOURCES += translator_option_data.cc
  libkea_yang_la_SOURCES += translator_option_data.h
 +libkea_yang_la_SOURCES += translator_option_def.cc
 +libkea_yang_la_SOURCES += translator_option_def.h
+ libkea_yang_la_SOURCES += translator_host.cc translator_host.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
@@@ -29,8 -28,8 +30,9 @@@ libkea_yang_include_HEADERS = 
        adaptor.h \
        sysrepo_error.h \
        translator.h \
 -      translator_option_data.h
+       translator_host.h \
 +      translator_option_data.h \
 +      translator_option_def.h
  
  EXTRA_DIST = yang.dox
  # Distribute yang models.

diff --cc src/lib/yang/tests/Makefile.am
index ec2f7ede94181ca8655ab6da5fe7a070d4485cad,7c3e5cd1cd36f66886a802173b8c9fc411203c84..9855e913a4c50ae350eeb80ef07ababe9e2e4922
--- 1/src/lib/yang/tests/Makefile.am
--- 2/src/lib/yang/tests/Makefile.am
+++ b/src/lib/yang/tests/Makefile.am
@@@ -21,7 -21,7 +21,8 @@@ run_unittests_SOURCES  = adaptor_unitte
  run_unittests_SOURCES += sysrepo_setup.h
  run_unittests_SOURCES += translator_unittests.cc
  run_unittests_SOURCES += translator_option_data_unittests.cc
 +run_unittests_SOURCES += translator_option_def_unittests.cc
+ run_unittests_SOURCES += translator_host_unittests.cc
  run_unittests_SOURCES += run_unittests.cc
  run_unittests_CPPFLAGS = $(AM_CPPFLAGS) $(GTEST_INCLUDES)
  run_unittests_LDFLAGS = $(AM_LDFLAGS) $(GTEST_LDFLAGS)