Merge branch 'stg-2.409'

diff --cc projects/sgconv/build
index 1bc23718283273258ff76eaaca402b2592ebb7d9,1bc23718283273258ff76eaaca402b2592ebb7d9..3c2f3f91367aae62e8cf88fdf6c9b47cc1e17228
--- 1/projects/sgconv/build
--- 2/projects/sgconv/build
+++ b/projects/sgconv/build
@@@ -72,7 -72,7 +72,6 @@@ printf "       Building sgconv for $sy
  printf "#############################################################################\n"
  
  STG_LIBS="logger.lib
--          locker.lib
            crypto.lib
            common.lib
            conffiles.lib

diff --cc projects/stargazer/plugins/configuration/sgconfig/configproto.cpp
index f012fa1a7e6c1a192ddc5b8beb6691f7c62a117b,567c537ae7f6a5aaef04ef641ff1ff77da829db6..f5a57a48ca11a6c377620b0892481335d4e3f7ef
--- 1/projects/stargazer/plugins/configuration/sgconfig/configproto.cpp
--- 2/projects/stargazer/plugins/configuration/sgconfig/configproto.cpp
+++ b/projects/stargazer/plugins/configuration/sgconfig/configproto.cpp
@@@ -83,7 -79,7 +83,6 @@@ int CONFIGPROTO::Prepare(
      sigaddset(&sigmask, SIGUSR1);
      sigaddset(&sigmask, SIGHUP);
      pthread_sigmask(SIG_BLOCK, &sigmask, &oldmask);
--
      m_listenSocket = socket(PF_INET, SOCK_STREAM, 0);
  
      if (m_listenSocket < 0)

diff --cc projects/stargazer/plugins/store/firebird/firebird_store_tariffs.cpp
Simple merge

diff --cc projects/stargazer/settings_impl.h
Simple merge

diff --cc stglibs/pinger.lib/Makefile
index c8c09b3e7ec258005800aefbb153cb94a255a5d9,c8c09b3e7ec258005800aefbb153cb94a255a5d9..803f7ac4edffd2464652fe8547937b35b0f42bad
--- 1/stglibs/pinger.lib/Makefile
--- 2/stglibs/pinger.lib/Makefile
+++ b/stglibs/pinger.lib/Makefile
@@@ -10,8 -10,8 +10,7 @@@ INCS = pinger.
  
  LIBS = $(LIB_THREAD)
  
--LIB_INCS = -I ../locker.lib/include \
--         -I ../common.lib/include
++LIB_INCS = -I ../common.lib/include
  
  include ../Makefile.in