Bug 1091113 - Don't merge obsolete entity fields. r=stas