Unify composer wildcard reference.
Add FormBuilder support for option-specified name on select
Merge branch '4.1'