SAML metadata changes

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