Collect server settings screen: remove 'Other' server type and replace 'ODK Aggregate' with 'ODK'

Ideas
5

This change is now available for preview in ODK Collect v1.28 Beta 1.