Reogranise curve colour selection list. Refs #6770

The default set should be a bit more distinguisable now and yellow has
been moved to the bottom as the default background colour is white
and yellow is then practically invisible.
Merge remote-tracking branch 'origin/feature/6770_curve_colours'