Fix additional occurrences of building-with-maven -> building-spark