saml key refactor
Merge remote-tracking branch 'upstream/master'
cleanup
publish protocol support
app importer
conflict
Merge pull request #803 from patriot1burke/master

saml entity descriptor importer