MULE-7109: Merge with 3.x branch
MULE-7109 - removing old comment regarding threading profile xsd type based on pull request feedback
MULE-7512: Synchronous until-successfull waits in milliseconds instead of seconds
MULE-7512: Merging conflicts