Removed instances of FetchType=EAGER for some entity relationships.

AFDP-32