Reconcile differences nova.localdomain <-> master