Fix duplication of spree option values when product is cloned

Fixes #4420
Fixes #4417