Revert "use xenial branch again"

Open Philip Müller requested to merge revert-68ad59f0 into master

This reverts commit 68ad59f0

Merge request reports