Issue #2346039 by ultimike, benjy: Add missing migrations to MigrateDrupal6Test and fix the result
Issue #2377967 by dawehner: Remove bc layer for _content _controller change