Merge "fixing clusterIP service type errors"