diff --git a/...adleaf-framework/src/main/java/org/broadleafcommerce/core/offer/dao/OfferCodeDaoImpl.java b/...adleaf-framework/src/main/java/org/broadleafcommerce/core/offer/dao/OfferCodeDaoImpl.java
diff --git a/.../broadleaf-framework/src/main/java/org/broadleafcommerce/core/offer/dao/OfferDaoImpl.java b/.../broadleaf-framework/src/main/java/org/broadleafcommerce/core/offer/dao/OfferDaoImpl.java
diff --git a/...main/java/org/broadleafcommerce/core/offer/domain/CandidateFulfillmentGroupOfferImpl.java b/...main/java/org/broadleafcommerce/core/offer/domain/CandidateFulfillmentGroupOfferImpl.java
diff --git a/...amework/src/main/java/org/broadleafcommerce/core/offer/domain/CandidateItemOfferImpl.java b/...amework/src/main/java/org/broadleafcommerce/core/offer/domain/CandidateItemOfferImpl.java
diff --git a/...mework/src/main/java/org/broadleafcommerce/core/offer/domain/CandidateOrderOfferImpl.java b/...mework/src/main/java/org/broadleafcommerce/core/offer/domain/CandidateOrderOfferImpl.java
diff --git a/...af-framework/src/main/java/org/broadleafcommerce/core/offer/domain/CustomerOfferImpl.java b/...af-framework/src/main/java/org/broadleafcommerce/core/offer/domain/CustomerOfferImpl.java
diff --git a/...src/main/java/org/broadleafcommerce/core/offer/domain/FulfillmentGroupAdjustmentImpl.java b/...src/main/java/org/broadleafcommerce/core/offer/domain/FulfillmentGroupAdjustmentImpl.java
diff --git a/...dleaf-framework/src/main/java/org/broadleafcommerce/core/offer/domain/OfferAuditImpl.java b/...dleaf-framework/src/main/java/org/broadleafcommerce/core/offer/domain/OfferAuditImpl.java
diff --git a/...adleaf-framework/src/main/java/org/broadleafcommerce/core/offer/domain/OfferCodeImpl.java b/...adleaf-framework/src/main/java/org/broadleafcommerce/core/offer/domain/OfferCodeImpl.java
diff --git a/.../broadleaf-framework/src/main/java/org/broadleafcommerce/core/offer/domain/OfferImpl.java b/.../broadleaf-framework/src/main/java/org/broadleafcommerce/core/offer/domain/OfferImpl.java
diff --git a/...adleaf-framework/src/main/java/org/broadleafcommerce/core/offer/domain/OfferInfoImpl.java b/...adleaf-framework/src/main/java/org/broadleafcommerce/core/offer/domain/OfferInfoImpl.java
diff --git a/...ramework/src/main/java/org/broadleafcommerce/core/offer/domain/OfferItemCriteriaImpl.java b/...ramework/src/main/java/org/broadleafcommerce/core/offer/domain/OfferItemCriteriaImpl.java
diff --git a/...adleaf-framework/src/main/java/org/broadleafcommerce/core/offer/domain/OfferRuleImpl.java b/...adleaf-framework/src/main/java/org/broadleafcommerce/core/offer/domain/OfferRuleImpl.java
diff --git a/...-framework/src/main/java/org/broadleafcommerce/core/offer/domain/OrderAdjustmentImpl.java b/...-framework/src/main/java/org/broadleafcommerce/core/offer/domain/OrderAdjustmentImpl.java
diff --git a/...mework/src/main/java/org/broadleafcommerce/core/offer/domain/OrderItemAdjustmentImpl.java b/...mework/src/main/java/org/broadleafcommerce/core/offer/domain/OrderItemAdjustmentImpl.java
diff --git a/...af-framework/src/main/java/org/broadleafcommerce/core/offer/service/OfferServiceImpl.java b/...af-framework/src/main/java/org/broadleafcommerce/core/offer/service/OfferServiceImpl.java
diff --git a/...c/main/java/org/broadleafcommerce/core/offer/service/processor/AbstractBaseProcessor.java b/...c/main/java/org/broadleafcommerce/core/offer/service/processor/AbstractBaseProcessor.java
diff --git a/...mework/src/main/java/org/broadleafcommerce/core/offer/service/type/OfferDeliveryType.java b/...mework/src/main/java/org/broadleafcommerce/core/offer/service/type/OfferDeliveryType.java
diff --git a/...mework/src/main/java/org/broadleafcommerce/core/offer/service/type/OfferDiscountType.java b/...mework/src/main/java/org/broadleafcommerce/core/offer/service/type/OfferDiscountType.java
diff --git a/...main/java/org/broadleafcommerce/core/offer/service/type/OfferItemRestrictionRuleType.java b/...main/java/org/broadleafcommerce/core/offer/service/type/OfferItemRestrictionRuleType.java
diff --git a/...-framework/src/main/java/org/broadleafcommerce/core/offer/service/type/OfferRuleType.java b/...-framework/src/main/java/org/broadleafcommerce/core/offer/service/type/OfferRuleType.java
diff --git a/...leaf-framework/src/main/java/org/broadleafcommerce/core/offer/service/type/OfferType.java b/...leaf-framework/src/main/java/org/broadleafcommerce/core/offer/service/type/OfferType.java
diff --git a/...framework/src/main/java/org/broadleafcommerce/core/order/dao/FulfillmentGroupDaoImpl.java b/...framework/src/main/java/org/broadleafcommerce/core/order/dao/FulfillmentGroupDaoImpl.java
diff --git a/...ework/src/main/java/org/broadleafcommerce/core/order/dao/FulfillmentGroupItemDaoImpl.java b/...ework/src/main/java/org/broadleafcommerce/core/order/dao/FulfillmentGroupItemDaoImpl.java
diff --git a/.../broadleaf-framework/src/main/java/org/broadleafcommerce/core/order/dao/OrderDaoImpl.java b/.../broadleaf-framework/src/main/java/org/broadleafcommerce/core/order/dao/OrderDaoImpl.java
diff --git a/...adleaf-framework/src/main/java/org/broadleafcommerce/core/order/dao/OrderItemDaoImpl.java b/...adleaf-framework/src/main/java/org/broadleafcommerce/core/order/dao/OrderItemDaoImpl.java
diff --git a/...c/main/java/org/broadleafcommerce/core/order/service/type/FulfillmentGroupStatusType.java b/...c/main/java/org/broadleafcommerce/core/order/service/type/FulfillmentGroupStatusType.java
diff --git a/...ork/src/main/java/org/broadleafcommerce/core/order/service/type/FulfillmentGroupType.java b/...ork/src/main/java/org/broadleafcommerce/core/order/service/type/FulfillmentGroupType.java
diff --git a/...-framework/src/main/java/org/broadleafcommerce/core/order/service/type/OrderItemType.java b/...-framework/src/main/java/org/broadleafcommerce/core/order/service/type/OrderItemType.java
diff --git a/...af-framework/src/main/java/org/broadleafcommerce/core/order/service/type/OrderStatus.java b/...af-framework/src/main/java/org/broadleafcommerce/core/order/service/type/OrderStatus.java
diff --git a/...af-framework/src/main/java/org/broadleafcommerce/core/payment/dao/PaymentInfoDaoImpl.java b/...af-framework/src/main/java/org/broadleafcommerce/core/payment/dao/PaymentInfoDaoImpl.java
diff --git a/...mework/src/main/java/org/broadleafcommerce/core/payment/dao/SecurePaymentInfoDaoImpl.java b/...mework/src/main/java/org/broadleafcommerce/core/payment/dao/SecurePaymentInfoDaoImpl.java
diff --git a/...ramework/src/main/java/org/broadleafcommerce/core/payment/service/PaymentServiceImpl.java b/...ramework/src/main/java/org/broadleafcommerce/core/payment/service/PaymentServiceImpl.java
diff --git a/...mework/src/main/java/org/broadleafcommerce/core/payment/service/type/PaymentInfoType.java b/...mework/src/main/java/org/broadleafcommerce/core/payment/service/type/PaymentInfoType.java
diff --git a/...rk/src/main/java/org/broadleafcommerce/core/payment/service/type/PaymentLogEventType.java b/...rk/src/main/java/org/broadleafcommerce/core/payment/service/type/PaymentLogEventType.java
diff --git a/...mework/src/main/java/org/broadleafcommerce/core/payment/service/type/TransactionType.java b/...mework/src/main/java/org/broadleafcommerce/core/payment/service/type/TransactionType.java
diff --git a/.../src/main/java/org/broadleafcommerce/core/payment/service/workflow/PaymentActionType.java b/.../src/main/java/org/broadleafcommerce/core/payment/service/workflow/PaymentActionType.java
diff --git a/...f-framework/src/main/java/org/broadleafcommerce/core/pricing/dao/ShippingRateDaoImpl.java b/...f-framework/src/main/java/org/broadleafcommerce/core/pricing/dao/ShippingRateDaoImpl.java
diff --git a/...in/java/org/broadleafcommerce/core/pricing/service/workflow/type/ShippingServiceType.java b/...in/java/org/broadleafcommerce/core/pricing/service/workflow/type/ShippingServiceType.java
diff --git a/...f-framework/src/main/java/org/broadleafcommerce/core/rating/dao/RatingSummaryDaoImpl.java b/...f-framework/src/main/java/org/broadleafcommerce/core/rating/dao/RatingSummaryDaoImpl.java
diff --git a/...af-framework/src/main/java/org/broadleafcommerce/core/rating/dao/ReviewDetailDaoImpl.java b/...af-framework/src/main/java/org/broadleafcommerce/core/rating/dao/ReviewDetailDaoImpl.java
diff --git a/...-framework/src/main/java/org/broadleafcommerce/core/rating/service/RatingServiceImpl.java b/...-framework/src/main/java/org/broadleafcommerce/core/rating/service/RatingServiceImpl.java
diff --git a/...roadleaf-framework/src/main/java/org/broadleafcommerce/core/util/dao/CodeTypeDaoImpl.java b/...roadleaf-framework/src/main/java/org/broadleafcommerce/core/util/dao/CodeTypeDaoImpl.java
diff --git a/core/broadleaf-framework/src/main/resources/bl-framework-applicationContext-persistence.xml b/core/broadleaf-framework/src/main/resources/bl-framework-applicationContext-persistence.xml
diff --git a/core/broadleaf-profile-web/pom.xml b/core/broadleaf-profile-web/pom.xml
diff --git a/...b/src/main/java/org/broadleafcommerce/profile/web/controller/CustomerPhoneController.java b/...b/src/main/java/org/broadleafcommerce/profile/web/controller/CustomerPhoneController.java
diff --git a/...e-web/src/main/java/org/broadleafcommerce/profile/web/email/EmailClickTrackingFilter.java b/...e-web/src/main/java/org/broadleafcommerce/profile/web/email/EmailClickTrackingFilter.java
diff --git a/...e-web/src/main/java/org/broadleafcommerce/profile/web/email/EmailOpenTrackingServlet.java b/...e-web/src/main/java/org/broadleafcommerce/profile/web/email/EmailOpenTrackingServlet.java
diff --git a/core/broadleaf-profile/pom.xml b/core/broadleaf-profile/pom.xml
diff --git a/...roadleaf-profile/src/main/java/org/broadleafcommerce/profile/core/dao/AddressDaoImpl.java b/...roadleaf-profile/src/main/java/org/broadleafcommerce/profile/core/dao/AddressDaoImpl.java
diff --git a/...roadleaf-profile/src/main/java/org/broadleafcommerce/profile/core/dao/CountryDaoImpl.java b/...roadleaf-profile/src/main/java/org/broadleafcommerce/profile/core/dao/CountryDaoImpl.java
diff --git a/...-profile/src/main/java/org/broadleafcommerce/profile/core/dao/CustomerAddressDaoImpl.java b/...-profile/src/main/java/org/broadleafcommerce/profile/core/dao/CustomerAddressDaoImpl.java
diff --git a/...oadleaf-profile/src/main/java/org/broadleafcommerce/profile/core/dao/CustomerDaoImpl.java b/...oadleaf-profile/src/main/java/org/broadleafcommerce/profile/core/dao/CustomerDaoImpl.java
diff --git a/...af-profile/src/main/java/org/broadleafcommerce/profile/core/dao/CustomerPhoneDaoImpl.java b/...af-profile/src/main/java/org/broadleafcommerce/profile/core/dao/CustomerPhoneDaoImpl.java
diff --git a/...eaf-profile/src/main/java/org/broadleafcommerce/profile/core/dao/IdGenerationDaoImpl.java b/...eaf-profile/src/main/java/org/broadleafcommerce/profile/core/dao/IdGenerationDaoImpl.java
diff --git a/.../broadleaf-profile/src/main/java/org/broadleafcommerce/profile/core/dao/PhoneDaoImpl.java b/.../broadleaf-profile/src/main/java/org/broadleafcommerce/profile/core/dao/PhoneDaoImpl.java
diff --git a/core/broadleaf-profile/src/main/java/org/broadleafcommerce/profile/core/dao/RoleDaoImpl.java b/core/broadleaf-profile/src/main/java/org/broadleafcommerce/profile/core/dao/RoleDaoImpl.java
diff --git a/.../broadleaf-profile/src/main/java/org/broadleafcommerce/profile/core/dao/StateDaoImpl.java b/.../broadleaf-profile/src/main/java/org/broadleafcommerce/profile/core/dao/StateDaoImpl.java
diff --git a/core/broadleaf-profile/src/main/java/org/broadleafcommerce/profile/core/dao/UserDaoImpl.java b/core/broadleaf-profile/src/main/java/org/broadleafcommerce/profile/core/dao/UserDaoImpl.java
diff --git a/...in/java/org/broadleafcommerce/profile/core/domain/listener/TemporalTimestampListener.java b/...in/java/org/broadleafcommerce/profile/core/domain/listener/TemporalTimestampListener.java
diff --git a/...profile/src/main/java/org/broadleafcommerce/profile/core/service/CustomerServiceImpl.java b/...profile/src/main/java/org/broadleafcommerce/profile/core/service/CustomerServiceImpl.java
diff --git a/...oadleafcommerce/profile/core/service/handler/EmailNotificationPasswordUpdatedHandler.java b/...oadleafcommerce/profile/core/service/handler/EmailNotificationPasswordUpdatedHandler.java
diff --git a/...eaf-profile/src/main/java/org/broadleafcommerce/profile/core/service/type/LocaleType.java b/...eaf-profile/src/main/java/org/broadleafcommerce/profile/core/service/type/LocaleType.java
diff --git a/...broadleaf-profile/src/main/java/org/broadleafcommerce/profile/payment/CreditCardType.java b/...broadleaf-profile/src/main/java/org/broadleafcommerce/profile/payment/CreditCardType.java
diff --git a/core/broadleaf-profile/src/main/java/org/broadleafcommerce/profile/util/DateUtil.java b/core/broadleaf-profile/src/main/java/org/broadleafcommerce/profile/util/DateUtil.java
diff --git a/...-profile/src/main/java/org/broadleafcommerce/profile/util/DimensionUnitOfMeasureType.java b/...-profile/src/main/java/org/broadleafcommerce/profile/util/DimensionUnitOfMeasureType.java
diff --git a/...eaf-profile/src/main/java/org/broadleafcommerce/profile/util/WeightUnitOfMeasureType.java b/...eaf-profile/src/main/java/org/broadleafcommerce/profile/util/WeightUnitOfMeasureType.java
diff --git a/...java/org/broadleafcommerce/profile/vendor/service/monitor/handler/EmailStatusHandler.java b/...java/org/broadleafcommerce/profile/vendor/service/monitor/handler/EmailStatusHandler.java
diff --git a/...e/src/main/java/org/broadleafcommerce/profile/vendor/service/type/ContainerShapeType.java b/...e/src/main/java/org/broadleafcommerce/profile/vendor/service/type/ContainerShapeType.java
diff --git a/...le/src/main/java/org/broadleafcommerce/profile/vendor/service/type/ContainerSizeType.java b/...le/src/main/java/org/broadleafcommerce/profile/vendor/service/type/ContainerSizeType.java
diff --git a/...le/src/main/java/org/broadleafcommerce/profile/vendor/service/type/ServiceStatusType.java b/...le/src/main/java/org/broadleafcommerce/profile/vendor/service/type/ServiceStatusType.java
diff --git a/core/broadleaf-profile/src/main/resources/META-INF/persistence-profile.xml b/core/broadleaf-profile/src/main/resources/META-INF/persistence-profile.xml
diff --git a/core/broadleaf-profile/src/main/resources/bl-profile-applicationContext-entity.xml b/core/broadleaf-profile/src/main/resources/bl-profile-applicationContext-entity.xml
diff --git a/core/broadleaf-profile/src/main/resources/bl-profile-applicationContext-persistence.xml b/core/broadleaf-profile/src/main/resources/bl-profile-applicationContext-persistence.xml
diff --git a/core/broadleaf-profile/src/main/resources/bl-profile-applicationContext.xml b/core/broadleaf-profile/src/main/resources/bl-profile-applicationContext.xml
diff --git a/...c/main/resources/org/broadleafcommerce/common/email/service/props/defaultEmail.properties b/...c/main/resources/org/broadleafcommerce/common/email/service/props/defaultEmail.properties
diff --git a/...profile/email/service/template/default.vm → .../common/email/service/template/default.vm b/...profile/email/service/template/default.vm → .../common/email/service/template/default.vm
diff --git a/.../main/resources/org/broadleafcommerce/profile/email/service/props/defaultEmail.properties b/.../main/resources/org/broadleafcommerce/profile/email/service/props/defaultEmail.properties
diff --git a/...resources/org/broadleafcommerce/profile/extensibility/context/StandardConfigLocations.txt b/...resources/org/broadleafcommerce/profile/extensibility/context/StandardConfigLocations.txt
diff --git a/integration/pom.xml b/integration/pom.xml
diff --git a/integration/src/main/java/org/broadleafcommerce/checkout/service/DummyCreditCardModule.java b/integration/src/main/java/org/broadleafcommerce/checkout/service/DummyCreditCardModule.java
diff --git a/integration/src/main/resources/bl-applicationContext-test.xml b/integration/src/main/resources/bl-applicationContext-test.xml
diff --git a/...erce/profile/email/service/EmailTest.java → ...merce/common/email/service/EmailTest.java b/...erce/profile/email/service/EmailTest.java → ...merce/common/email/service/EmailTest.java
diff --git a/...mmerce/openadmin/time/SystemTimeTest.java → ...fcommerce/common/time/SystemTimeTest.java b/...mmerce/openadmin/time/SystemTimeTest.java → ...fcommerce/common/time/SystemTimeTest.java
diff --git a/integration/src/test/java/org/broadleafcommerce/core/checkout/service/CheckoutTest.java b/integration/src/test/java/org/broadleafcommerce/core/checkout/service/CheckoutTest.java
diff --git a/integration/src/test/java/org/broadleafcommerce/core/content/ContentDaoDataProvider.java b/integration/src/test/java/org/broadleafcommerce/core/content/ContentDaoDataProvider.java
diff --git a/integration/src/test/java/org/broadleafcommerce/core/content/dao/ContentDaoTest.java b/integration/src/test/java/org/broadleafcommerce/core/content/dao/ContentDaoTest.java
diff --git a/...rg/broadleafcommerce/core/inventory/service/dataprovider/SkuAvailabilityDataProvider.java b/...rg/broadleafcommerce/core/inventory/service/dataprovider/SkuAvailabilityDataProvider.java
diff --git a/integration/src/test/java/org/broadleafcommerce/core/offer/OfferDataProvider.java b/integration/src/test/java/org/broadleafcommerce/core/offer/OfferDataProvider.java
diff --git a/integration/src/test/java/org/broadleafcommerce/core/offer/service/OfferTest.java b/integration/src/test/java/org/broadleafcommerce/core/offer/service/OfferTest.java
diff --git a/integration/src/test/java/org/broadleafcommerce/core/pricing/service/PricingTest.java b/integration/src/test/java/org/broadleafcommerce/core/pricing/service/PricingTest.java
diff --git a/integration/src/test/resources/testng.xml b/integration/src/test/resources/testng.xml
diff --git a/module/broadleaf-cybersource/pom.xml b/module/broadleaf-cybersource/pom.xml
diff --git a/...c/main/java/org/broadleafcommerce/payment/service/module/CyberSourceCreditCardModule.java b/...c/main/java/org/broadleafcommerce/payment/service/module/CyberSourceCreditCardModule.java
diff --git a/.../org/broadleafcommerce/vendor/cybersource/service/payment/type/CyberSourceMethodType.java b/.../org/broadleafcommerce/vendor/cybersource/service/payment/type/CyberSourceMethodType.java
diff --git a/...broadleafcommerce/vendor/cybersource/service/payment/type/CyberSourceTransactionType.java b/...broadleafcommerce/vendor/cybersource/service/payment/type/CyberSourceTransactionType.java
diff --git a/...in/java/org/broadleafcommerce/vendor/cybersource/service/type/CyberSourceServiceType.java b/...in/java/org/broadleafcommerce/vendor/cybersource/service/type/CyberSourceServiceType.java
diff --git a/module/broadleaf-usps/pom.xml b/module/broadleaf-usps/pom.xml
diff --git a/...usps/src/main/java/org/broadleafcommerce/vendor/usps/service/type/USPSFirstClassType.java b/...usps/src/main/java/org/broadleafcommerce/vendor/usps/service/type/USPSFirstClassType.java
diff --git a/...src/main/java/org/broadleafcommerce/vendor/usps/service/type/USPSServiceResponseType.java b/...src/main/java/org/broadleafcommerce/vendor/usps/service/type/USPSServiceResponseType.java
diff --git a/...af-usps/src/main/java/org/broadleafcommerce/vendor/usps/service/type/USPSServiceType.java b/...af-usps/src/main/java/org/broadleafcommerce/vendor/usps/service/type/USPSServiceType.java
diff --git a/.../src/main/java/org/broadleafcommerce/vendor/usps/service/type/USPSShipDateOptionType.java b/.../src/main/java/org/broadleafcommerce/vendor/usps/service/type/USPSShipDateOptionType.java
diff --git a/.../main/java/org/broadleafcommerce/vendor/usps/service/type/USPSShippingPriceErrorCode.java b/.../main/java/org/broadleafcommerce/vendor/usps/service/type/USPSShippingPriceErrorCode.java
diff --git a/pom.xml b/pom.xml
diff --git a/...-archetype/src/main/resources/archetype-resources/admin-war/src/main/resources/import.sql b/...-archetype/src/main/resources/archetype-resources/admin-war/src/main/resources/import.sql
diff --git a/...chetype-resources/admin-war/src/main/webapp/WEB-INF/applicationContext-admin-security.xml b/...chetype-resources/admin-war/src/main/webapp/WEB-INF/applicationContext-admin-security.xml
diff --git a/...erce-archetype/src/main/resources/archetype-resources/admin-war/src/main/webapp/login.jsp b/...erce-archetype/src/main/resources/archetype-resources/admin-war/src/main/webapp/login.jsp
diff --git a/...archetype/src/main/resources/archetype-resources/site-war/src/main/webapp/WEB-INF/web.xml b/...archetype/src/main/resources/archetype-resources/site-war/src/main/webapp/WEB-INF/web.xml