Canvas: Unroll groups with only one item.  Closes #1656
Fixes django tests