CLSN-154 merge billing from old to new
billing service merged and small changed made in datalayer billiing section