Indexing related cleanups.
Merge branch 'master' of github.com:strongbox/strongbox