Merge pull request #3871 from jlsherrill/cvv_load

fixes #4782 - speeding up CV Version content count methods
Fixes #4815 - Added foreign keys for content view tables