[1687]Merge branch 'master' into trac1687

removed the conflicting generated files

diff --cc configure.ac
Simple merge

diff --cc src/bin/auth/Makefile.am
Simple merge

diff --cc src/bin/cfgmgr/Makefile.am
Simple merge

diff --cc src/bin/dhcp4/Makefile.am
Simple merge

diff --cc src/bin/dhcp6/Makefile.am
Simple merge

diff --cc src/bin/host/Makefile.am
index 6d1bd04c15817e9470518019761a117fed58e9da,22fba652bc23c9a6bdff5617dae1f5c7b3993897..c5e6959b1133ce8195a246710319056c98188c87
--- 1/src/bin/host/Makefile.am
--- 2/src/bin/host/Makefile.am
+++ b/src/bin/host/Makefile.am
@@@ -12,12 -12,11 +12,12 @@@ CLEANFILES = *.gcno *.gcd
  
  bin_PROGRAMS = b10-host
  b10_host_SOURCES = host.cc
- b10_host_LDADD = $(top_builddir)/src/lib/dns/libdns++.la
- b10_host_LDADD += $(top_builddir)/src/lib/util/libutil.la
- b10_host_LDADD += $(top_builddir)/src/lib/exceptions/libexceptions.la
+ b10_host_LDADD = $(top_builddir)/src/lib/dns/libb10-dns++.la
+ b10_host_LDADD += $(top_builddir)/src/lib/util/libb10-util.la
+ b10_host_LDADD += $(top_builddir)/src/lib/exceptions/libb10-exceptions.la
  
  man_MANS = b10-host.1
 +CLEANFILES += $(man_MANS)
  EXTRA_DIST = $(man_MANS) b10-host.xml
  
  .PHONY: man

diff --cc src/bin/loadzone/Makefile.am
Simple merge

diff --cc src/bin/resolver/Makefile.am
Simple merge

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

diff --cc src/bin/sysinfo/Makefile.am
Simple merge