Better resolution handling for active manifests with identical ACLs

Better confliect resolution handling for case where two active state
manifests that have identical ACLs. Prior to this change this situation
could result in an object becoming unavailable.
Handle case where a cluster id may be undefined for an active state manifest
Merge branch 'bugfix/active-manifest-resolution' into 1.2