Merged trust engines back into a unified version, made metadata roles a "KeyInfoSource".