Merge citrix branch into master.

diff --cc lib/automake.mk
index 4851cdf589a3b06bc7bb21dd456a2be3976b8c18,b447aa5601438c8d0eb2d49e6215bc5b1a3d0808..4d2924b6394b4d5f7d06ec7b0f20c56cd6cfc512
--- 1/lib/automake.mk
--- 2/lib/automake.mk
+++ b/lib/automake.mk
@@@ -159,7 -157,8 +157,8 @@@ install-data-local
        $(MKDIR_P) $(DESTDIR)$(LOGDIR)
  
  # All the source files that have coverage counters.
 -COVERAGE_SOURCES = \
 +COVERAGE_FILES = \
+       lib/cfg.c \
        lib/dpif.c \
        lib/flow.c \
        lib/hmap.c \
@@@ -177,8 -176,9 +176,9 @@@
        secchan/ofproto.c \
        secchan/pktbuf.c \
        vswitchd/bridge.c \
-       vswitchd/mgmt.c
+       vswitchd/mgmt.c \
+       vswitchd/ovs-brcompatd.c
 -lib/coverage-counters.c: $(COVERAGE_SOURCES) lib/coverage-scan.pl
 -      (cd $(srcdir) && $(PERL) lib/coverage-scan.pl $(COVERAGE_SOURCES)) > $@.tmp
 +lib/coverage-counters.c: $(COVERAGE_FILES) lib/coverage-scan.pl
 +      (cd $(srcdir) && $(PERL) lib/coverage-scan.pl $(COVERAGE_FILES)) > $@.tmp
        mv $@.tmp $@
  EXTRA_DIST += lib/coverage-scan.pl