Merge "Keep stable branch jobs on Ubuntu Xenial"