Merge branch 'nether' into tizen

Change-Id: If0dd79ca73bc75b14666067a8a11afd2680f7931

diff --cc CMakeLists.txt
Simple merge

diff --cc packaging/security-tests.spec
index 96a3bb9,4145d08..1ae363e
--- 1/packaging/security-tests.spec
--- 2/packaging/security-tests.spec
+++ b/packaging/security-tests.spec
@@@ -108,9 -105,11 +114,10 @@@ 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
 +%caps(cap_mac_admin=ep) /usr/bin/ckm-privileged-tests
 +%caps(cap_mac_admin=ep) /usr/bin/ckm-integration-tests
  /usr/bin/yaca-test
+ /usr/bin/nether-tests
  %{ckm_test_dir}/*
  /etc/security-tests
  /usr/lib/security-tests/cynara-tests/plugins/single-policy/*

diff --cc src/security-tests-all.sh
Simple merge

diff --cc src/security-tests.sh
Simple merge