CLC-1796 Change Task bucket structure per new designs
Merge pull request #1092 from ctweney/clc-1796

CLC-1796 Change Task bucket structure per new designs