Merge pull request #3002 from Nicofuma/ticket/12987

[ticket/12987] Cleanup the services.yml file

* Nicofuma/ticket/12987:
  [ticket/12987] Cleanup the services.yml file