Maven

This is going to fail on Jenkins, so we'll deal with Jenkins separately, right now I just want feedback on the diff. I suggest you review the two commits separately as they are logically isolated. The only exception is pom.xml.