End cities spawn on main island, other issues

When generating the end dimension, end cities spawn on the main island. 

Also, when an end gateway spawns, it takes you back to the spawn platform.

Also posted as private because it contains the seed to our server.

 

Tested with seed 5139918260965333663