Some changes to get it all working in Jetty/WebLogic and to implement pass-through authorities for Spring world
Merge remote-tracking branch 'origin/master'