Update JMSEmailServiceProducerImpl.java

I think there was an else forgotten. This method always throws exceptions and probably it should throw only if props isn't instance of Serializable;
Merge pull request #1132 from Pr0TuX/patch-1

IllegalArgumentException incorrectly thrown in valid circumstance.   Update JMSEmailServiceProducerImpl.java
Ports are Integer not String
(cherry picked from commit 7e2d501dbe82fae2bb1f46e40af8a825c1f9adb1)
Merge branch 'BroadleafCommerce-3.0.x' into BroadleafCommerce-3.1.x
Map key is Sku not Long
(cherry picked from commit 019825890f4f01a12675439bb2b221e218c8f60e)
Long have to be compared using equals
(cherry picked from commit d4256b2ef9057902f1ac1a1420c5786609424edb)
Long have to be compared using equals
(cherry picked from commit 5a865399a474b021e63637bbfef470c8c8ffccb1)
Escape regular expression character in split
(cherry picked from commit 25c418636c4aceaefe59494132b790199af8d0f8)
Merge branch 'BroadleafCommerce-3.0.x' into BroadleafCommerce-3.1.x

Conflicts:
	core/broadleaf-framework/src/main/java/org/broadleafcommerce/core/search/domain/SearchSynonymImpl.java
Escape regular expression character in split
(cherry picked from commit f6b9f28b8c08d1200677fcabd76db58897c72290)
Long have to be compared using equals
(cherry picked from commit 5cb94c3a70ff035e24915db61a120fbf9b520cf3)
Merge branch 'BroadleafCommerce-3.0.x' into BroadleafCommerce-3.1.x
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