The color swatches in the color scale dialog's annotation page
did not match the colors assigned by the scalar bar actor when
columns were sorted. Fix that.

When in categorical color mode, the NaN color could not be edited.
Fix that by adding a second NaN color button.

Change-Id: I22b9af0fe2f0e64c693f56d0308e983848b49c9a