Only return not disabled CFs when loading for BasedOn setting
Merge branch '4.2/exclude-disabled-cf-initialdata' into 4.2-trunk