Merge "Add maven-aether-provider"