Repair some instances of content type.
Merge branch '7.x-3.x' into add-to-default