Merge "cluster: add services_extra_states"