Merge "Move neutron settings out of puppet/compute.yaml"