Updated Puppet guide for Origin v4
Merge pull request #5612 from nhr/v4_puppet_guide_updates

Updated Puppet guide for Origin v4
Final changes to the comp guide for v4
Merge pull request #5616 from nhr/v4_final_comp_guide_changes

Final changes to the comp guide for v4