Added custom parameter map to WorkflowDefinition and StepDefinition
Merge from upstream