Some csDataBuilder.py fixes

This is actually two commits, apologies, I thought I could issues 2 pull requests, but it seems github only supports pull requests for all downstream changes. 

The first is the sort LOCALE fix. 

The second is a fix which was causing testServer.py to fall over when delete_intermediary was set to false.