Attempt fix for ModifyEntityTestBase::resetEntities

This didn't reset ModifyEntityTestBase::entityOutput

Change-Id: I65b8dc59366c10c8cb0aaa79f0fb84458f3e8952
Merge "Attempt fix for ModifyEntityTestBase::resetEntities"