[65-libyang-pd-pool_rebased] Addressed rebase conflicts

diff --cc src/lib/yang/Makefile.am
index 4cc6efac0c3dfd0a88c7909ac4aea8604a4f1ecf,09df0ec0ef3c2782ea03c526e3c1b9ff118ed89b..7321b123c56025e840b01c40d5c0c5b110f52c47
--- 1/src/lib/yang/Makefile.am
--- 2/src/lib/yang/Makefile.am
+++ b/src/lib/yang/Makefile.am
@@@ -16,7 -16,7 +16,8 @@@ 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_pd_pool.cc translator_pd_pool.h
 +libkea_yang_la_SOURCES += translator_host.cc translator_host.h
  libkea_yang_la_SOURCES += yang_models.h
  
  

diff --cc src/lib/yang/tests/Makefile.am
index 03000fc2ba2d6ad28eb86c3743dfc466c76557b0,7eb665b9a667e1ff468fccc99a4ad3ad301c0834..33504fef3e825afe2daaaa94f3fe8bddac1da17a
--- 1/src/lib/yang/tests/Makefile.am
--- 2/src/lib/yang/tests/Makefile.am
+++ b/src/lib/yang/tests/Makefile.am
@@@ -25,7 -25,7 +25,8 @@@ run_unittests_SOURCES += translator_dat
  run_unittests_SOURCES += translator_option_data_unittests.cc
  run_unittests_SOURCES += translator_option_def_unittests.cc
  run_unittests_SOURCES += translator_pool_unittests.cc
+ run_unittests_SOURCES += translator_pd_pool_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)