Removed including ID in Metadata EntityDescriptor as default implementation was a copy of entityID. This caused problems as entityID was of type anyURI while ID of type NCName and validationg IdPs would reject the metadata.