Applied bug fix from trunk r1646943.
Applied patch from jira issue - OFBIZ-4558 - Verify subscription email requires form submit.
Thanks Kiran for creating the issue, Thanks Deepak for provding the patch.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/branches/release12.04@1646946 13f79535-47bb-0310-9956-ffa450edef68