[65-libyang-control-socket_rebased] Addressed rebase conflicts

diff --cc src/lib/yang/Makefile.am
index 9df3306b8b898c9465f09bd7d9aff17fe22ff3c5,c6e463102de4dac1b36de4f5671e588ae26f58dd..7fb92ac28608b8a960f444389babe64c0beefecb
--- 1/src/lib/yang/Makefile.am
--- 2/src/lib/yang/Makefile.am
+++ b/src/lib/yang/Makefile.am
@@@ -8,10 -8,10 +8,12 @@@ 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_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_LIBADD =  $(top_builddir)/src/lib/asiolink/libkea-asiolink.la
  libkea_yang_la_LIBADD += $(top_builddir)/src/lib/cc/libkea-cc.la
@@@ -29,8 -29,8 +31,9 @@@ libkea_yang_include_HEADERS = 
        adaptor.h \
        sysrepo_error.h \
        translator.h \
 -      translator_option_data.h
+       translator_control_socket.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,a3cd3eaf86fc6658b86e7de85d5af058851c8058..4ad44d831add8e93408a6093b76f7cd747ce61e1
--- 1/src/lib/yang/tests/Makefile.am
--- 2/src/lib/yang/tests/Makefile.am
+++ b/src/lib/yang/tests/Makefile.am
@@@ -20,8 -20,8 +20,9 @@@ 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_option_data_unittests.cc
 +run_unittests_SOURCES += translator_option_def_unittests.cc
  run_unittests_SOURCES += run_unittests.cc
  run_unittests_CPPFLAGS = $(AM_CPPFLAGS) $(GTEST_INCLUDES)
  run_unittests_LDFLAGS = $(AM_LDFLAGS) $(GTEST_LDFLAGS)