moved Keyspace class from s-c to s-d-c in prep for complete removal
Merge branch 'master' into DATACASS-52