Merge branches 'ckm', 'security-manager' and 'cynara' into 'tizen'