put back files lost in move
Merge branch 'master' of github.com:vert-x/mod-web-server