8.2
[Form] Add a "choice_help" option to ChoiceType
Mark callbacks with @param-immediately-invoked-callable where applicable
Merge branch '5.4' into 6.0
Merge branch '7.0' into 7.1