Long have to be compared using equals
(cherry picked from commit dd7ec11a8719d9597bda35b613d810b72e07fbee)
Long have to be compared using equals
(cherry picked from commit 81c32aed5024978bd53c0de595b0b6b6341569de)
Long can never be equals to a String
(cherry picked from commit 6ae87757bec567218b885d5a70fcdf0a8b958f77)
Correct equality check
(cherry picked from commit e946f7101b4c02d4d5e2063e05cae36025b0a2f3)
Remove possible null pointer dereference
(cherry picked from commit ebd3b528c5d16467f6ce1c9bf295e0aa7e2b35f6)
Remove possible null pointer dereference
(cherry picked from commit 31e32eef5b6849d4db9e73d1f4deae3e3772f4f1)
Add an empty list if there are no subcategories

(cherry picked from commit 72f05c6929d3485e63cb906cfd46bf82daae3051)
Merge branch 'BroadleafCommerce-3.0.x' into BroadleafCommerce-3.1.x

Conflicts:
	core/broadleaf-profile/src/main/java/org/broadleafcommerce/profile/core/service/CustomerAddressServiceImpl.java
	core/broadleaf-profile/src/main/java/org/broadleafcommerce/profile/core/service/CustomerPhoneServiceImpl.java