Merging content view definition api tests
Merge pull request #2091 from daviddavis/temp_1366988588

Merging content view def api tests