Fixing issue where jobs have completed
Adding default concurrent execution option due to backwards compatibility issues.
Merge branch 'release-2.1'