Merge branch 'tizen' into ckm

Change-Id: I420a571f81f4abdec743722b0ebac6c128b399d6

diff --cc src/ckm/capi-testcases.cpp
Simple merge

diff --cc src/ckm/initial-values.cpp
index 73c6357,8016267..9f0b600
--- 1/src/ckm/initial-values.cpp
--- 2/src/ckm/initial-values.cpp
+++ b/src/ckm/initial-values.cpp
@@@ -112,8 -115,9 +112,9 @@@ void test_exists(const std::string& nam
  
  RUNNER_TEST_GROUP_INIT(T60_INITIAL_VALUES);
  
 -RUNNER_TEST(T6010_PARSE_XML_FILE_AT_STARTUP)
 +RUNNER_TEST(T6010_PARSE_XML_FILE_AT_STARTUP, RemoveDataEnv<0>)
  {
+     RUNNER_IGNORED_MSG("Temporary turned off. This test requires password protected db.");
      // [prepare]
      // remove database 0
      // copy to the initial-values folder

diff --cc src/ckm/main.cpp
Simple merge