#1002 - Offer engine incorrectly triggers legacy mode for empty targets
(Cherry picked from BroadleafCommerce-3.1.0-M2-x
#1002 - Add help messaging for offer item restriction rule types
Merge branch 'BroadleafCommerce-3.0.x' into BroadleafCommerce-3.1.x

Conflicts:
	admin/broadleaf-open-admin-platform/src/main/resources/messages/GeneratedMessagesEntityFramework.properties
Merge branch 'BroadleafCommerce-3.1.x' into develop