Issue #2246863: Conditionals not entirely deleting when removed.
Merge tag '7.x-4.0-rc3' of git://drupalcode.org/project/webform