Merge "Drop Xenial support"