Updates to disable renewals if card is expired.  Allows renewals for expired cards with ptypes 6 and 8
Merge branch 'june' into darkknight2