redo some undone changes from 14.6.3

git-svn-id: https://plugins.svn.wordpress.org/cforms2/trunk@1009544 b8457f37-d9ea-0310-8a92-e5e31aec5664