Moved the symbol annotation properties, and added similar datatype properties.
Replaced all occurances of the obsolete symbol annotation properties with the new symbol datatype properites.
Replaced all occurances of the obsolete symbol annotation properties with the new symbol datatype properites.
Merge branch 'master' into ax