Merge branch 'master' into windows-port

Change-Id: Ia2e02ce01d3cb8b73b22f7c2ff4169c340d6f72f
Signed-off-by: David Antler <david.a.antler@intel.com>

diff --cc resource/csdk/connectivity/src/adapter_util/caadapternetdtls.c
Simple merge

diff --cc resource/csdk/security/provisioning/src/ownershiptransfermanager.c
Simple merge

diff --cc resource/csdk/security/src/aclresource.c
Simple merge

diff --cc resource/csdk/security/unittest/aclresourcetest.cpp
Simple merge

diff --cc resource/csdk/stack/include/octypes.h
Simple merge

diff --cc resource/csdk/stack/include/payload_logging.h
Simple merge

diff --cc resource/csdk/stack/src/ocpayload.c
Simple merge

diff --cc resource/csdk/stack/src/ocpayloadconvert.c
Simple merge

diff --cc resource/csdk/stack/src/ocpayloadparse.c
Simple merge

diff --cc resource/csdk/stack/test/stacktests.cpp
Simple merge

diff --cc resource/include/OCRepresentation.h
Simple merge

diff --cc resource/src/OCRepresentation.cpp
Simple merge