Add wrapper mapping per form basis.

Fixes #931.
Changelog entry for wrapper mapping per form basis.
Merge pull request #934 from rcillo/add-form-wrapper

Add wrapper mapping per form basis.