Support NameID without Format attribute
Merge branch 'support-nameid-without-format-attribute'