Drop rivet2 from configuration.
Merge pull request #778 from ktf/drop-rivet2

Drop rivet2