Merge "lib/neutron: configure root_helper for agents"