Merge "Rename service_workflow_tasks into workflow_tasks" into stable/pike

diff --cc common/deploy-steps.j2
Simple merge

diff --cc common/services.yaml
index b55a5c4,725f4e9..a0015c7
--- 1/common/services.yaml
--- 2/common/services.yaml
+++ b/common/services.yaml
@@@ -270,10 -260,9 +270,10 @@@ outputs
        config_settings: {map_merge: {get_attr: [ServiceChain, role_data, config_settings]}}
        global_config_settings: {get_attr: [GlobalConfigSettings, value]}
        service_config_settings: {get_attr: [ServiceConfigSettings, value]}
-       service_workflow_tasks: {get_attr: [ServiceWorkflowTasks, value]}
+       workflow_tasks: {get_attr: [WorkflowTasks, value]}
        step_config: {get_attr: [PuppetStepConfig, value]}
        upgrade_tasks: {get_attr: [UpgradeTasks, value]}
 +      post_upgrade_tasks: {get_attr: [PostUpgradeTasks, value]}
        update_tasks: {get_attr: [UpdateTasks, value]}
        upgrade_batch_tasks: {get_attr: [UpgradeBatchTasks, value]}
        service_metadata_settings: {get_attr: [ServiceServerMetadataHook, metadata]}

diff --cc docker/services/ceph-ansible/ceph-base.yaml
Simple merge

diff --cc tools/yaml-validate.py
Simple merge