LP#1704116: fix intermittant failure of parallel building