Improvements to group code:
	1) Postpone some of the metaedge processing to collapse
	2) Improve group destroy

Fixes #2036

Change-Id: I3c0835c8f3cbeac024d958b2e06ddf2db0e99d25