fix cluster for service masters of cluster variants
fix bug in creating default services in a serviceGroup

RB=156958
R=osumampo,sihde,si-dev
A=osumampo
bump version