adding DFP fields to single CAPI template
Merge branch 'master' into commercial-capi-newfields
removing fields from multi component that shouldn't be there
removing unrequired options
Merge pull request #7105 from guardian/commercial-capi-newfields

Commercial capi newfields