Merge "init: allow '.' and '@' in service names"