Fixed Database upgrade test  from 1.9.7 to 1.10 to write to a test and not actual app data dir - TRUNK-4488
Applying auto format changes