Removed 'Possible values' notation in a few annotations; it is very brittle and given that these elements point to Enums, is not very useful
Merge remote-tracking branch 'upstream/version_2.1' into version_2.1