ug-2815 fix build test due to concurrency, included old pr #273 & #274 from apigee/ug-stack
Merge pull request #5 from cywjackson/ug-2815

ug-2815 fix build test due to concurrency, included old pr #273 & #274 from apigee/ug-stack