Merge pull request #3408 from shenki/kernel-security-options

kernel: Enable security options