Feature/support metadata extension mdui

Add models to handle SAML MDUI specification per http://docs.oasis-open.org/security/saml/Post2.0/sstc-saml-metadata-ui/v1.0/sstc-saml-metadata-ui-v1.0.pdf
To replace both those lines, and avoid the branch entirely.