NCI-Agency/anet#3035: Remove code duplication when retrieving nav orgs
NCI-Agency/anet#3035: Remove code duplication when retrieving nav orgs

After the code review: refactored the code for retrieving the
principal and advisor organizations to remove the duplication.

NCI-Agency/anet,NCI-Agency/anet,NCI-Agency/anet,NCI-Agency/anet,NCI-Agency/anet