Fixup two space merge conflict from 2.7.x => master

I accidentally merged Carl's #302 topic branch into master instead of
2.7.x because of the name of the topic branch. This is actually OK
because Matt recently merged up 2.7.x into master.

The problem was I amended Carl's original commit to fix a trailing
whitespace issue.

We then went and cherry picked his original commit (with the trailing
whitespace still present) into a topic branch based on 2.7.x and merged
into 2.7.x.

This caused 2.7.x and master to diverge and conflict the next time 2.7.x
is merged up into master.

This commit fixes the merge conflict automatically for the next person
merging up.

Conflicts:

spec/unit/util/retryaction_spec.rb