Merging tizen into ckm. Stage 3.

Merged remote-tracking branch 'tizen.org/tizen' into ckm

Change-Id: Iffa2e26113f653cf4c6f685bc7e4dc7d25472ae5

diff --cc CMakeLists.txt
Simple merge

diff --cc packaging/security-tests.spec
index 8b561ac,c4de72e..fac0fe8
--- 1/packaging/security-tests.spec
--- 2/packaging/security-tests.spec
+++ b/packaging/security-tests.spec
@@@ -65,14 -61,8 +65,14 @@@ find /etc/smack/test_privilege_control_
  find /usr/apps/test_DIR/ -type f -name exec -exec chmod 0755 {} +
  
  # Load permissions templates
- api_feature_loader --verbose --clear-permissions
+ api_feature_loader --verbose
  
 +# Set vconf key for cc-mode testing if vconf key isn't there.
 +%if "%{sec_product_feature_security_mdfpp_enable}" != "1"
 +    echo "Install vconf key (file/security_mdpp/security_mdpp_state) for testing key-manager"
 +    vconftool set -t string file/security_mdpp/security_mdpp_state "Unset"
 +%endif
 +
  echo "security-tests postinst done ..."
  
  %postun

diff --cc src/common/CMakeLists.txt
Simple merge