Bug #805742

Also ensures the profileicon field is cleared when the artefact
it points to gets deleted.

Change-Id: Idfda6111b3d653e26225bff90500706ec5dd66a7
Signed-off-by: Richard Mansfield <richard.mansfield@catalyst.net.nz>