Improve tomcat restart
Merge branch 'develop' of github.com:rinfo/rdl into develop