Merge "Fixing Iotivity crash in catcpserver" into tizen_5.5