Fixing composite content view smoke test
Merge pull request #1970 from daviddavis/temp_1366050026

Fixing composite content view smoke test