Corrections in org.openiot.ui.billing.rest and
org.openiot.ui.billing.service