Merge "Fix crash of osp-security-service" into tizen_2.1