Merge latest changes from upstream

This is a fast-forward merge of https://github.com/apache/maven-indexer/tree/master into trunk