Small Provider refactor while fixing test regressions

SpecGerritTriggerHudsonTest.testDoubleTriggeredBuildOfDifferentType
is still failing.