Refs #5958 - content-view puppet modules

Various fixes. See commit messages for details.
hehe `Couldn't` :)