The first patch (1/2 - Fixes failing test) fixes a test that fails in environments where
we call a provider a "Cloud Resource Provider" instead. However, this fix
applies to all environments, so it should end up on master too.
The second patch removes a related test that would expose the same bug, except that on
further discussion, the test was deemed to not belong in Cucumber or our test suite, so I
have removed it. It won't fail if it's left in, but it doesn't accomplish
anything.
-- Matt