Make the service_type more consistent

Change "workflow_service" to "workflow".
Closes-Bug: #1330787

Change-Id: I90bb7e5bb1f9c5686e0c81bba9c82170a754567d
Merge "Make the service_type more consistent"