update Trilinos contract test

The old version encountered a compile error on newer versions of GCC.
Update to the latest supported release of Trilinos, remove the version
number from the name of the Contract, and some other minor tweaks to
get the test passing once more.
Merge topic 'update_trilinos_contract_test' into next

5a4a584 update Trilinos contract test