947869 - Allowing users to create composite definitions from CLI
Merge pull request #1917 from daviddavis/temp_1365706716

947869 - Allowing users to create composite definitions from CLI