Merge "Drop nodesets with ubuntu-xenial"