Fixes because of Claims refactoring in CXF 3
Support caching option for trusted Idp tokens
Merge branch 'master' of http://git-wip-us.apache.org/repos/asf/cxf-fediz