[BugFix] Little bug fix inside product model

You could not set a master variant if the variant was already included
and not master. This patch fixed it.
Merge pull request #1616 from steffenbrem/product-model-bugfix

[BugFix] Little bug fix inside product model