Merge branch 'master' into sqlite
Merge branch 'master' into sqlite
Using open connection for optimized overrides.

For xerial object db we override putAll and deleteAll with an optimized
batch implementation. This fix ensures that they are use the previously open
connection.
Explicit dependency from web/geoserver on geoserver ows module.

Dependencies with scope 'provided' are not transitive. So code with a compile
time dependency (such as the web/geoserver) must explicitly declare it.
Merge pull request #572 from jdeolive/geoserver-ows-dep

Explicit dependency from web/geoserver on geoserver ows module.
Merge branch 'master' into sqlite
Fixing bad String.format string
Added dependency management for spring-expression.

spring-expression is transitive through ows, which is transitive through
spring-security, which depends on a version different than what geoserver
depends no. Because the geoserver dependencies are provided we don't inherit
the dependency management that deals with this issue.
Fixed #575 (issue with merge-base always returning the current head commit)
Update functional tests for command syntax change
Merge remote-tracking branch 'groldan/plugins' into plugins
Merge branch 'plugins'
Properly restoring transaction/autocommit state after batch operations.
Merge pull request #576 from volaya/merge_base_fix

Fix for merge-base command
Merge branch 'master' into jdeolive_sqlite
Enable sqlite as a storage backend option for CLI