Merge branch 'master' into ra.to.merge

Conflicts:
	resource/csdk/stack/samples/linux/SimpleClientServer/ocserver.cpp

Change-Id: I70ecb709845861789f326053b2135ca964bd21a5
Signed-off-by: Mandeep Shetty <mandeep.shetty@intel.com>

diff --cc Readme.scons.txt
Simple merge

diff --cc build_common/SConscript
Simple merge

diff --cc resource/csdk/SConscript
Simple merge

diff --cc resource/csdk/stack/samples/linux/SimpleClientServer/ocremoteaccessclient.cpp
Simple merge

diff --cc resource/csdk/stack/samples/linux/SimpleClientServer/ocserver.cpp
index 35bb562,66441a0..d8908ba
--- 1/resource/csdk/stack/samples/linux/SimpleClientServer/ocserver.cpp
--- 2/resource/csdk/stack/samples/linux/SimpleClientServer/ocserver.cpp
+++ b/resource/csdk/stack/samples/linux/SimpleClientServer/ocserver.cpp
@@@ -978,8 -952,16 +981,17 @@@ int main(int argc, char* argv[]
          PrintUsage();
          return -1;
      }
 +
  #ifdef RA_ADAPTER
+     OCRAInfo_t rainfo;
+     rainfo.hostname = "localhost";
+     rainfo.port = 5222;
+     rainfo.xmpp_domain = "localhost";
+     rainfo.username = "test1";
+     rainfo.password = "intel123";
+     rainfo.resource = "";
+     rainfo.user_jid = "";
+ 
      OCSetRAInfo(&rainfo);
  #endif