Adding Java 7 support
Rework inMemory to pass tests again.  Dynamic storage service selection through environment var