neutron: reorder data path agent and service agents, restore dependencies