Merge branch 'master' into 'master'

Update plantuml.md Fix wrong order when restarting tomcat service [ci skip]

See merge request !10855

doc/administration/integration/plantuml.md

@@ -28,7 +28,7 @@ using Tomcat:
 sudo apt-get install tomcat7
 sudo cp target/plantuml.war /var/lib/tomcat7/webapps/plantuml.war
 sudo chown tomcat7:tomcat7 /var/lib/tomcat7/webapps/plantuml.war
-sudo service restart tomcat7
+sudo service tomcat7 restart
 ```
 Once the Tomcat service restarts the PlantUML service will be ready and