Merge pull request #4434 from daviddavis/temp/20140716091214
Fixes #6635,BZ1114046 - Fixing undefined method cp_id error
Merge pull request #4434 from daviddavis/temp/20140716091214
Fixes #6635,BZ1114046 - Fixing undefined method cp_id error