Improvements to AbstractField
Fix country FT
Merge pull request #3075 from obrignoni/2.3/patch-choice

2.3/patch choice
Merge branch 'refs/heads/2.3/develop' into 3.0/develop

Conflicts:
	system/cms/modules/streams_core/field_types/country/src/Pyro/FieldType/Country.php