grouper: Remove Trebuchet overlay

Change-Id: I955911ded41e9a78925971f6042a865caf390014
Merge remote-tracking branch 'cm/cm-11.0' into HEAD