US5995: Added public extract API endpoint. Removed public extract from edOrg endpoint.
US5995: Fixed merge conflicts.  Minor cleanup.