There is no need to test here whether v2 is disabled or not. V3
Authentication will always be available and we should just use that.
This backport is needed as the options used were deprecated in liberty already, and this is breaking grenade jobs.
Change-Id: I0d2d76ebdf261917f1a2b23c65f0f843ae50f49a
(cherry picked from commit 394968fa3d)