Parallel fix for http://review.motechproject.org/#/c/4740/5

Change-Id: Ic7f6bec5280f31f61a387af34bc6f1702b14f7a2
Merge "Parallel fix for http://review.motechproject.org/#/c/4740/5"