C* 2.1 doesn't create dir name with uuid if dir is already present

on C* 2.1.12 if you create a new table and a directory with the same name already exist under the keyspace then C* will simply use that directory rather than creating a new one that has uuid in the name.
Even if you drop and recreate the same table it will still use the previous dir and never switch to a new one with uuid. This can happen on one of the nodes in the cluster while the other nodes will use the uuid format for the same table.
For example I dropped and recreated the same table three times in this test on a two nodes cluster

node1
drwxr-xr-x 3 cassandra cassandra 4096 Dec 1 23:47 mytable

node2
drwxr-xr-x 3 cassandra cassandra 4096 Dec 1 23:47 mytable-678a7e31988511e58ce7cfa0aa9730a2
drwxr-xr-x 3 cassandra cassandra 4096 Dec 1 23:41 mytable-cade4ee1988411e58ce7cfa0aa9730a2
drwxr-xr-x 2 cassandra cassandra 4096 Dec 1 23:47 mytable-db1b9b41988511e58ce7cfa0aa9730a2

This seems to break the changes introduced by CASSANDRA-5202