Merge branch 'cynara' into tizen

Change-Id: I115ec35a71d6f2a08f2dc08bbc6b63e0b0156e50

diff --cc packaging/security-tests.spec
index 1358aec,54174ce..24816e6
--- 1/packaging/security-tests.spec
--- 2/packaging/security-tests.spec
+++ b/packaging/security-tests.spec
@@@ -115,6 -111,4 +115,7 @@@ echo "security-tests postinst done ...
  /usr/lib/security-tests/cynara-tests/plugins/multiple-policy/*
  /usr/lib/security-tests/cynara-tests/plugins/test-agent/*
  /usr/bin/security-tests-inner-test
- id -u security_test_user  1>/dev/null 2>&1 && userdel security_test_user
+ /usr/bin/libwebappenc-tests
 +
 +%postun
++id -u security_test_user  1>/dev/null 2>&1 && userdel security_test_user

diff --cc src/security-manager-tests/CMakeLists.txt
Simple merge