Merge branch 'master' into connectivity-abstraction

Conflicts:
	resource/csdk/makefile

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

diff --cc resource/csdk/stack/src/ocstack.c
index def6a57,eb0aef8..d9c32d1
--- 1/resource/csdk/stack/src/ocstack.c
--- 2/resource/csdk/stack/src/ocstack.c
+++ b/resource/csdk/stack/src/ocstack.c
@@@ -2380,34 -2377,3 +2377,34 @@@ OCStackResult getResourceType(const cha
      exit:
          return OC_STACK_NO_MEMORY;
  }
- }
 +
 +const ServerID OCGetServerInstanceID(void)
 +{
 +    static bool generated = false;
 +    static ServerID sid;
 +
 +    if(generated)
 +    {
 +        return sid;
 +    }
 +
 +    sid = OCGetRandom();
 +    generated = true;
 +    return sid;
 +}
 +
 +const char* OCGetServerInstanceIDString(void)
 +{
 +    // max printed length of a base 10
 +    // uint32 is 10 characters, so 11 includes null.
 +    // This will change as the representation gets switched
 +    // to another value
 +    static char buffer[11];
 +    int n = sprintf(buffer, "%u", OCGetServerInstanceID());
 +    if (n < 0)
 +    {
 +        buffer[0]='\0';
 +    }
 +
 +    return buffer;
++}