Merge "Revert "Build infrautils with maven-3.6""