BroadleafCommerce/BroadleafCommerce#485  - fixing issues with order payment in the Admin and DB