Resolved DROID problem with ANTLR version causing ID to fail. Added a test for it too.
Fixing minor issues with the indexing of fields and metadata.
Merge branch '2.0.x-dev-branch' of github.com:ukwa/webarchive-discovery into 2.0.x-dev-branch