26748 - added swatches to faceted search
Merge PR and fix dist conflicts.
Merge branch https://github.com/texasag/vn-toolbox-common.git master