Make sure cluster is removed from polymorphicClusterIds
Merge pull request #2515 from mcculls/issue-2511-polymorphic-cluster-ids-fix

OClass.removeClusterId doesn't remove cluster from polymorphicClusterIds