ENT-10830: Build steps no longer write duplicate entries to def.json where appropriate

ENT-10830: Build steps no longer write duplicate entries to def.json where appropriate #717