Cumulative fixes from D7 backported
Merge pull request #254 from JacksonRiver/sb4-6.x-151-backport-fixes-webform-dupe-cop

Cumulative fixes from D7 backported