Merge remote-tracking branch 'origin/tizen' into ode

Change-Id: I50afe029d7b1dc04d8c77fb648ab923c7a41aee7

diff --cc CMakeLists.txt
Simple merge

diff --cc packaging/security-tests.spec
index 80ab147,f96f79b..2d3e333
--- 1/packaging/security-tests.spec
--- 2/packaging/security-tests.spec
+++ b/packaging/security-tests.spec
@@@ -99,9 -99,10 +100,11 @@@ echo "security-tests postinst done ...
  %attr(755, security_test_user,users) %{TZ_SYS_HOME}/security_test_user/apps_rw/*
  /usr/bin/cynara-test
  /usr/bin/ckm-tests
+ /usr/bin/ckm-privileged-tests
+ /usr/bin/ckm-tests-on-onlycap.sh
  /usr/bin/ckm-integration-tests
  /usr/bin/yaca-test
 +/usr/bin/ode-tests
  %{ckm_test_dir}/*
  /etc/security-tests
  /usr/lib/security-tests/cynara-tests/plugins/single-policy/*