7.x 4.x 629 stored card used for payment processing

Various fixes to correct the saving and handling of the card on file values.