#700 - Fix compilation error
Fixes #710 - Add null check protection to state and country fields.    UK client was getting null pointer due to lack of state field.
Merge branch 'BroadleafCommerce-3.0.x' into BroadleafCommerce-3.1.x

Conflicts:
	common/src/main/java/org/broadleafcommerce/common/i18n/service/TranslationServiceImpl.java