NXP-13754: follow JSF id changes in dam includes