#630 : inhibit addition of extra condition upon rule builder reset
Merge remote-tracking branch 'origin/BroadleafCommerce-3.0.x' into develop