#1163 - Make sure we are comparing ID to ID when querying for subcategories
Merge branch 'BroadleafCommerce-3.0.x' into BroadleafCommerce-3.1.x

Conflicts:
	core/broadleaf-framework/src/main/resources/config/bc/jpa/domain/Category.orm.xml