refactoring, and integration of the cancel draft action
Merge branch 'master' of github.com:networking/init-cms-bundle