make sure we retry valiodation failures

because a uniqueness validation can and will
raise a InvalidRecord error, we need to retry on those
as well as RecordNotUnique

MSP-11757
floating change got pulled in

code changes form other work got pulled in
incorrectly. removing the extraneous change
fix login status issues too

should not set a login's status back to UNTRIED if
it has already been tried.
Land #81, Retry on RecordInvalid

MSP-11757