Fixes #6635,BZ1114046 - Fixing undefined method cp_id error

Was getting an error on content host create (undefined method `cp_id`) due to
the content view not being in the environment.
Merge pull request #4434 from daviddavis/temp/20140716091214

Fixes #6635,BZ1114046 - Fixing undefined method cp_id error