Adding CK_USHORT back in, for pedantic tests' sake
Adding CK_USHORT back in, for pedantic tests' sake

ekr/nss-old,nmav/nss,nmav/nss,ekr/nss-old,nmav/nss,nmav/nss,nmav/nss,ekr/nss-old,nmav/nss,ekr/nss-old,ekr/nss-old,nmav/nss,ekr/nss-old,ekr/nss-old