Added support for adding/removing custom keynames for distributors at the organization level.
Navigation to orgs from system was broken. Fixed it.
Minor change to test doc string.