More changes to API to get VCMTP to build
Merge branch 'master' of github.com:Unidata/vcmtp

Conflicts:
	VCMTPv3/shawn/vcmtpv2_recv_shawn/vcmtpRecv.cpp
	VCMTPv3/shawn/vcmtpv2_recv_shawn/vcmtpRecv.h
	shawn/vcmtpBase.h
Merge branch 'master' of github.com:Unidata/vcmtp