Changes to permit use of gwc sqlite-blobstore.
Merge remote-tracking branch 'upstream/master' into gwc-sqlite-blobstore
Merged changes from 2.4.
Working version with corrected gwc version entries.