Issue #2177313 by mikeryan: Make sure reused file entities are saved to pick up field changes