Refs #5958 - content-view puppet modules

Various fixes. See commit messages for details.
are we using `remove` everywhere for for destroy actions, or `delete`? or is this conceptually different?