CDB-1352 #resolve - fixed problem with extra colors in color picker + used colors in wizards
Merge remote-tracking branch 'origin/CDB-1352' into release/2.11.1