[PATCH 21/64] Remapped CM-2 to nist_not_OS_applicable