Merge remote-tracking branch 'asf/master' into sixpack

Conflicts:
	indexer-core/src/main/java/org/apache/maven/index/incremental/DefaultIncrementalHandler.java
	indexer-core/src/main/java/org/apache/maven/index/packer/DefaultIndexPacker.java