[OFBIZ-7010] Shipping method is shown on all Promo Conditions even when only a single condition includes Shipping Method. Thanks Swapnil M Mane for reporting the issue and providing the patch. Applying fix from trunk r1739447.