Swaps in hue-based colors for "primary" and "secondary" variables
#1947

ericronne wants to merge 1814-pt2-color-assignments into develop

We do not currently have an analysis of these two commits