Merge "init: account for "init.svc." prefix in IsValidName"