Homomorphic Cluster Coherent Potential Approximation for Systems with Site-Diagonal and/or Off-Diagonal Randomness