Merge branch 'tizen_3.0' into tizen

diff --cc src/convergence/convergence_instance.cc
Simple merge

diff --cc src/convergence/convergence_remote_app_control_service.cc
index 201b26d8696400197110c0003d5249d0e1a87d9a,f6525232c6ea85d7742c5beaea175f58689e4119..53ef57f5799f01316bf606d9773dcf851c9d49cd
--- 1/src/convergence/convergence_remote_app_control_service.cc
--- 2/src/convergence/convergence_remote_app_control_service.cc
+++ b/src/convergence/convergence_remote_app_control_service.cc
@@@ -123,7 -128,7 +128,8 @@@ TizenResult ConvergenceRemoteAppControl
      return LogAndCreateTizenError(AbortError, "Service with specified type does not exist");
    }
  
-   const int error = conv_service_disconnect(service);
+   int error = conv_service_disconnect(service);
++
    if (CONV_ERROR_NONE != error) {
      return LogAndCreateTizenError(AbortError, "conv_service_disconnect [Fail]");
    } else {

diff --cc src/convergence/convergence_utils.cc
index bfc67b0b8a592b3742b0d59040568799893ac91b,bbe9a7c0bd93ada9e26636d7d40962674005feb7..f14cac2044042d76336b683735aaf8631a67ad6a
--- 1/src/convergence/convergence_utils.cc
--- 2/src/convergence/convergence_utils.cc
+++ b/src/convergence/convergence_utils.cc
@@@ -95,6 -95,8 +95,9 @@@ common::TizenResult ConvergenceUtils::C
        // return common::InvalidStateError(error);
        return common::AbortError(error);
    }
+ 
+   return common::TizenSuccess();
++
  }
  
  } // namespace convergence