[65-libyang-logger_rebased] Addressed rebase conflicts

diff --cc src/lib/yang/Makefile.am
index 7321b123c56025e840b01c40d5c0c5b110f52c47,b61f3b9881a993c96c5a2d199177584821261091..a0f0de8dbe2c791373b0402c000e786726a7f846
--- 1/src/lib/yang/Makefile.am
--- 2/src/lib/yang/Makefile.am
+++ b/src/lib/yang/Makefile.am
@@@ -39,7 -38,7 +40,8 @@@ libkea_yang_include_HEADERS = 
        translator.h \
        translator_control_socket.h \
        translator_database.h \
 +      translator_host.h \
+       translator_logger.h \
        translator_option_data.h \
        translator_option_def.h \
        translator_pool.h \

diff --cc src/lib/yang/tests/Makefile.am
Simple merge