Merge branch '3.3.x'
Merge pull request #6943 from marc1706/ticket/17622 [ticket/17622] Improve handling of branches for when newer versions exist on server