CMS-860 Refactor ContentDao handlers to move content versions in the same branch as content