Merge branch 'release/4.0.3' (early part)
Adding the @Service stereotype annotation breaks running locally
Merge branch 'hotfix/jettyrun-broken' into develop