Fixes gh-4128
Fixes gh-3907
The build now uses spring build conventions to simplify the build Fixes gh-4284