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