t295, t294 - Passing display requirements in form elements for mapping to pick up.
Merge remote branch 'origin/7.x-3.0-qa' into 7.x-3.0-qa