Merge pre-existing schema with the system defined one during upgrade

Patch by marcuse; reviewed by Sam Tunnicliffe for CASSANDRA-19615
2 files changed