Issue #2118991 by Berdir, dawehner: Use abstract service definitions to minimize copy & pasted service definitions.