fixes for using richer environments/<env>/services for service_instance API