BroadleafCommerce/BroadleafCommerce#485  - fixing more issues found when integrating Gift Card as a Payment Method with the Account Credit Module