AUI-983 - ColorPickerBase doesn't display properly

If more than one node is set as trigger, ColorPicker does not
display properly.
Merge branch 'master' into 2.0.x