Use return value from TokenEnhancer.enhance
Merged MITREid Connect master
Don't delete the entire client when a single email address is removed
Don't blow up when scope is missing from launch request