Make the organization configurable
Merge branch 'config_org' into nps-identity