Merge "Fix nova-compute.conf templates:"