Description of problem:
Removing default info for system/distributor at Organization level gives a success message but does not remove the custom info attached to the corresponding systems/distributors

How reproducible:
everytime

Steps to Reproduce:

1. Create Org
> org create --name newOrg
2. Create distributor 
> distributor create --name newDistributor --org newOrg
3. Attach default custom info to the distributors of newOrg
> org default_info add --name newOrg --keyname newKey --type distributor
> org default_info apply --name newOrg --type distributor
4. The default custom info shows up for the distributor 
> distributor info --name newDistributor --org newOrg
5. Remove the default info
> org default_info remove --name newOrg --keyname newKey --type distributor
> org default_info apply --name newOrg --type distributor
6. The default custom info is still present
> distributor info --name newDistributor --org newOrg

Actual results:
The default info is not removed from the distributors in context

Expected results:
The default info that was removed should not be present