[65-libyang-database_rebased] Addressed rebase conflicts

diff --cc src/lib/yang/Makefile.am
index 5078360b70707276595afe2dde3ff5c37fd585c1,d72f434c2f2c035d72ca5bec3c187a95beeebefe..899bb78bef90a00e50a6aebcbf199d9831dd8055
--- 1/src/lib/yang/Makefile.am
--- 2/src/lib/yang/Makefile.am
+++ b/src/lib/yang/Makefile.am
@@@ -8,8 -8,7 +8,9 @@@ lib_LTLIBRARIES = libkea-yang.l
  libkea_yang_la_SOURCES  = adaptor.cc adaptor.h
  libkea_yang_la_SOURCES += sysrepo_error.h
  libkea_yang_la_SOURCES += translator.cc translator.h
 +libkea_yang_la_SOURCES += translator_control_socket.cc
 +libkea_yang_la_SOURCES += translator_control_socket.h
+ libkea_yang_la_SOURCES += translator_database.cc translator_database.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
@@@ -33,7 -33,7 +35,8 @@@ libkea_yang_include_HEADERS = 
        adaptor.h \
        sysrepo_error.h \
        translator.h \
 +      translator_control_socket.h \
+       translator_database.h \
        translator_option_data.h \
        translator_option_def.h \
        translator_pool.h \

diff --cc src/lib/yang/tests/Makefile.am
index 155789f4f43163cd06dcd0ebf22e7f291dd9f36e,1184bf5c48f139182396ac2c78cfccbe936f0a81..e7646371f7c1c22b51b721681761a100c2d760b7
--- 1/src/lib/yang/tests/Makefile.am
--- 2/src/lib/yang/tests/Makefile.am
+++ b/src/lib/yang/tests/Makefile.am
@@@ -20,7 -20,7 +20,8 @@@ TESTS += run_unittest
  run_unittests_SOURCES  = adaptor_unittests.cc
  run_unittests_SOURCES += sysrepo_setup.h
  run_unittests_SOURCES += translator_unittests.cc
 +run_unittests_SOURCES += translator_control_socket_unittests.cc
+ run_unittests_SOURCES += translator_database_unittests.cc
  run_unittests_SOURCES += translator_option_data_unittests.cc
  run_unittests_SOURCES += translator_option_def_unittests.cc
  run_unittests_SOURCES += translator_pool_unittests.cc