Merge "Add endpoint_type option to Savanna,Ironic and Ceilometer groups"