Updates for Rivet_i to make it compatible with v3.1.0 on master needed for AGENE-1787.
cc/ @ewelina and @jchapman