Issue #2327287 by gdaw: Fixed Webforms on submit give 404.
Merge pull request #3 from wet-boew-wem/7.x-1.x

Merge Fixes from 2.x branch to 1.x branch.