Merge pull request #3702 from daviddavis/cv-merge-master

Merging in master
Content Views: Adding version to content view environments