Merge pull request #1 from flowedback/master

Pull latest from flowedback:master
Update attribute-resolver.xml

Fixed some issues with exceptions thrown when not using the standard MultiFactorAuth for authentication.
Merge pull request #2 from spaetow/patch-1

Update attribute-resolver.xml
Merge pull request #1 from spaetow/master

Update attribute-resolver.xml