Fix previous merge issues

Author: phillipuniverse

core/broadleaf-framework-web/src/main/java/org/broadleafcommerce/core/web/processor/OnePageCheckoutProcessor.java

@@ -286,6 +286,7 @@ protected void populateSectionViewStates(Map<String,Object> localVars) {
         boolean showBillingInfoSection = true;
         boolean showShippingInfoSection = true;
         boolean showAllPaymentMethods = true;
+        boolean showPaymentMethodSection = true;
 
         int numShippableFulfillmentGroups = calculateNumShippableFulfillmentGroups();
         if (numShippableFulfillmentGroups == 0) {
@@ -325,6 +326,7 @@ protected void populateSectionViewStates(Map<String,Object> localVars) {
 
         localVars.put("showBillingInfoSection", showBillingInfoSection);
         localVars.put("showAllPaymentMethods", showAllPaymentMethods);
+        localVars.put("showPaymentMethodSection", showPaymentMethodSection);
         localVars.put("orderContainsThirdPartyPayment", orderContainsThirdPartyPayment);
         localVars.put("orderContainsUnconfirmedCreditCard", orderContainsUnconfirmedCreditCard);
         localVars.put("unconfirmedCC", unconfirmedCC);