Issue #2063671 by kim.pepper, ParisLiakos, LinL: Use the aggregator category storage in AggregatorCategorizeFormBase.