LPS-45276 - When assigning organizational roles, the search results only return site roles

Hey @natecavanaugh,

Attached is an update for http://issues.liferay.com/browse/LPS-45276.

NOTE: This is a forward port of https://issues.liferay.com/browse/LPS-27361 from 6.1.x.  For some reason it never made it to liferay-portal/master?

Please let me know if you have any questions.  Thanks!