SAML metadata changes

@stouset  I've rebase the commits from issue #36