VB-3191 updates from core webcode to fix variation set configs