Some minor fixes
Merge pull request #2997 from WouterJ/fix_form_component

Fixes for Form Component chapter
Change order of annotations to be the same as the gengerator

| Q             | A
| ------------- | ---
| Doc fix?      | yes
| New docs?     | no
| Applies to    | doctrine
| Fixed tickets |
Merge branch '2.1' into 2.2

Conflicts:
	components/form/introduction.rst