Fixed some merge-related errors so that Albany compiled when
ALBANY_EPETRA_EXE is turned OFF, and

nm --print-file-name --demangle --undefined-only libalbanyLib.a | grep Epetra | less

returns nothing.