CC-5109: Fix race-condition when updating cc_pref table
Merge branch 'master' of dev.sourcefabric.org:airtime