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 pull request #3000 from Urigo/patch-1

Change order of annotations to be the same as the generator