More updates for the cms extending tutorial
Merge pull request #2987 from mkoistinen/more_doc_updates

More updates for the cms extending tutorial