fixes #6336 - Fixes issue with not being able to use same name for an activation key across multiple orgs, BZ 1105024

I think these two tests should be at the model layer.