Merge branch 'master' into iot-1785

Change-Id: I7adad0e43bced555c87a3b3d7f220f2fff79a13a
Signed-off-by: Kevin Kane <kkane@microsoft.com>

diff --cc extlibs/mbedtls/config-iotivity.h
Simple merge

diff --cc resource/csdk/connectivity/api/cacommon.h
Simple merge

diff --cc resource/csdk/connectivity/test/ca_api_unittest.cpp
Simple merge

diff --cc resource/csdk/connectivity/test/ssladapter_test.cpp
Simple merge

diff --cc resource/csdk/security/include/internal/srmresourcestrings.h
Simple merge

diff --cc resource/csdk/security/include/securevirtualresourcetypes.h
Simple merge

diff --cc resource/csdk/security/provisioning/sample/provisioningclient.c
Simple merge

diff --cc resource/csdk/security/provisioning/sample/subownerclient.c
Simple merge

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

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

diff --cc resource/csdk/security/src/credresource.c
index cb72e89,28c2db8..2d80cfa
mode 100755,100644..100644
--- 1/resource/csdk/security/src/credresource.c
--- 2/resource/csdk/security/src/credresource.c
+++ b/resource/csdk/security/src/credresource.c

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

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

diff --cc resource/csdk/security/tool/json2cbor.c
Simple merge

diff --cc resource/csdk/stack/octbstack_product_secured.def
index 2a43031,400792b..cbe056a
--- 1/resource/csdk/stack/octbstack_product_secured.def
--- 2/resource/csdk/stack/octbstack_product_secured.def
+++ b/resource/csdk/stack/octbstack_product_secured.def
@@@ -23,21 -21,13 +23,22 @@@ OCDeleteRoleCertificateByCredI
  OCDeleteUuidList
  OCDiscoverOwnedDevices
  OCDiscoverSingleDevice
+ OCDiscoverSingleDeviceInUnicast
  OCDiscoverUnownedDevices
  OCDoOwnershipTransfer
 +OCGenerateCACertificate
 +OCGenerateIdentityCertificate
 +OCGenerateKeyPair
 +OCGenerateRandomSerialNumber
 +OCGenerateRoleCertificate
  OCGetACLResource
  OCGetCredResource
 +OCGetCSRResource
  OCGetDevInfoFromNetwork
  OCGetLinkedStatus
 +OCGetPublicKeyFromCSR
 +OCGetRolesResource
 +OCGetUuidFromCSR
  OCInitPM
  OCPDMCleanupForTimeout
  OCProvisionACL
@@@ -55,7 -44,7 +56,8 @@@ OCRemoveTrustCertChainNotifie
  OCResetDevice
  OCResetSVRDB
  OCSaveTrustCertChain
 +OCSaveOwnCertChain
+ OCSelectOwnershipTransferMethod
  OCSetOwnerTransferCallbackData
  OCUnlinkDevices
  OCSetOxmAllowStatus