CC-5756: Scheduler: Different results between Show contents and Add/Remove Contents
Merge branch '2.5.x' of github.com:sourcefabric/Airtime into 2.5.x