Issue #2307631: Fixed _not_ conditionals not reusing code.
Issue #2025555 by Mark Carver: theme_webform_element needs a preprocess function.
Merge branch '7.x-4.x' of git.drupal.org:project/webform into 7.x-4.x
Issue #2311897 by Liam Morland, DanChadwick: Fixed string handling in numeric comparisons.
Issue #2312717 by DanChadwick: Fixed redirect to view after editing submission.
Issue #2305357 by DanChadwick: Fixed new component label limited to 255 characters.
Issue #2290029 by DanChadwick: Disabled HTML5 number elements, using text instead.
Issue #2313521 by Liam Morland: Fixed webform submits with failed validation.
Issue #2307615: Added odt, ods, and odp to pre-listed allowed file types.
Issue #1781490 by DanChadwick: Fixed hidden conditional pages causing unexpected submit.
Issue #2315091 by pjcdawkins: Fixed number components should be type=text.
Issue #2315339 by DanChadwick: Fixed PDOException "no active transaction" on update 7416.