[master] Merge branch 'trac3734'

diff --cc src/bin/sockcreator/sockcreator.cc
Simple merge

diff --cc src/bin/sockcreator/sockcreator.h
Simple merge

diff --cc src/lib/dhcpsrv/lease_mgr_factory.h
Simple merge

diff --cc src/lib/log/logging.dox
Simple merge