Cherry-pick "add support for feature-collection indexing" into release/0.7

Manual cherry-pick for !124 (merged) into the release branch. Some conflicts in the pom files prevented the automatic cherry-pick from GitLab.