Aaron Wells authored Sep 26, 2016 and Robert Lyon committed Oct 07, 2016

Two of the server classes had their own implementations of this,
with slightly different logic. Moving it up into the parent class
in order to make sure everything works the same, all the time.

behatnotneeded: Can't test in Behat

Change-Id: I91c205822a18213c475bbef7c784247cebdbd649