Added delay-step and (alfresco) email step
Handling for PropertyReferences containing additional properties
Merge from upstream/master