[WEBSITE_MULTI][FIX] Inheritance mechanism, keep only one view per key, if the key is define, and prefer the one with the right website. Always remove view with the wrong website
Merge remote-tracking branch 'upstream/master'