Merge pull request #1550 from clebertsuconic/2.3.x

fixing failover test