Fix for BatchJobMongoDATest failing unit test.
Merge branch 'java-upgrade' of https://github.com/inbloomdev/datastore into java-upgrade