More updates in org.openiot.ui.billing.rest and corrections in
org.openiot.ui.billing.data