Made FCS_CKM.1.1 and FCS_CMK.2.1 have selections.