Merge "Modify --endpoint-type to --os-endpoint-type for nova"