Merge master and vswitchd branches

diff --cc Makefile.am
Simple merge

diff --cc controller/controller.8.in
Simple merge

diff --cc secchan/secchan.8.in
Simple merge

diff --cc udatapath/udatapath.8.in
Simple merge

diff --cc utilities/dpctl.8.in
Simple merge