Move back to CQLSH 2 to stop Telephus failures
Fix Python failure
Merge pull request #150 from Metaswitch/schema-scripts

[Reviewer: Ellie] Return to CQL 2.0 and fix Homer bug