backport freeside-daily -m and cust_main::bill_and_collect to 1.7, RT#4412