Cleanup debug flag so it activates debugging on the data server code itself This commit was SVN r18080.
Remains to be tested to ensure everything came over cleanly, so please continue to withhold commits a little longer This commit was SVN r17632.