BroadleafCommerce/BroadleafCommerce#485 - fixing Null Payment Gateway