Updated regex init for krb5 env. Updated id for cluster resource.
Merge branch 'feature/clusterfix' into develop