Update maven-config and consolidate sbt to use the same deps
Merge branch 'solutions'