Avoid server.pid errors when restarting web container
Merge branch 'feature/rm_server_pid' into develop