Refactor composite_cck.module to use fields framework. Add Composite Layout field for core upload.module [#564364].