CC-5230 : cc_pref can have duplicate keystrs when subjid is null
Merge branch '2.4.x' of dev.sourcefabric.org:airtime into 2.4.x