Remove the last references to deprecated Transaction.finish() from production code.
Remove unused old ShortString stuff.
Remove some calls to Transaction.finish() from test code.
Merge pull request #1171 from benbc/2.0-remove-deprecated-finish-calls

2.0 remove deprecated finish calls
converting nested literal maps for java compatibility
Move a functional test from its own folder to src/test.