[ref_impl_eiffel] [521] Temporary hack to try to fix CruiseControl, which should be overwriting local changes but instead is getting conflicts.

Revision: 521
Author: peter.gummer

Log Message: