CompositePropertySource extends EnumerablePropertySource now

Issue: SPR-12292