1.84 - SQL and cleanup

lookupAttributesUpdate now gets colorFacet info from SQL.

Misc cleanup.
Revert "1.84 - SQL and cleanup"

This reverts commit a14dca316a5d591530f326d41c827e940dafa723.
Whatever
1.84 Again
Merge remote-tracking branch 'origin/master'