Only compare principals for mixed principal case.

Fixes failing test caused by pull #415. Add test coverage to verify mixed
principal failure case.
Merge pull request #416 from serac/mfa-mixed-principal-fix

Only compare principals for mixed principal case.