"Expected contract missing" error from BillableUsageController with a pure PAYG contract

BillableUsageController - Given a pure PAYG contract, which comes across with neither dimensions for vCPUs nor instance hours, the billable usage controller is unable to recognize a contract when trying to send usage to AWS. This should be fixed by not filtering the contract lookup by metricId.