group collections

(Bug #1033315)

Change-Id: Ie8c7c2378b756dcfc871e72ab33f2a6fd7073831
Signed-off-by: Son Nguyen <son.nguyen@catalyst.net.nz>