Update archetypes to package to main plugins dir

Add build plugin cycle to jar to main plugins directory
Revert back to standard spring-web version
Merge remote-tracking branch 'upstream/master'