Manual merge of master into xovis branch

@tim-moody Why do you specify the same variables in two different places? Does it not suffice to include those in `roles/xovis/vars/main.yml`