Propagating Andy's fix of FAST_FELIX compilation to epetra branch.