fix handling of credit cards expiring in current month
fixes #5468

Conflicts:
	core/spec/models/spree/credit_card_spec.rb
Need timecop for a spec.