Don't include the common config twice...
Merge remote-tracking branch 'cm/cm-11.0' into kk4.4