All parts of the code that use _nonprimary_key_restrictions are changed to use _new_nonprimary_key_restrictions instead. I decided not to split this into multiple commits, as there isn't a lot of changes and they are analogous to the ones done before for partition and clustering columns. Signed-off-by: Jan Ciolek <jan.ciolek@scylladb.com>