Bug # 1769 Minor modifications to pass the tests. When trend controller tests are run, trend master is not available for backfilling