Readying branch for merge mainline

• Remove Guava dependencies; replace Cache class usage with LinkedHashMap
• Move cache (statement & sqltext) settings & defaults to Settings class
• Make query in cache performance test actually do something