refactoring: simplify guid generation
Merge branch 'master' into jetty7