Refs #5377 - Fixing content types test
Merge pull request #4040 from daviddavis/temp/20140502145424

Refs #5377 - Fixing content types test