InCommon: include SP entities as well as IdPs.

Include SPs from both InCommon and eduGAIN in the results.