Merge branch '5.4' into 6.3

* 5.4:
  Add Caddy section
  Clean-up Apache and Nginx parts
  modernize the web server configuration chapter

Author: javiereguiluz